Skip to content

Commit

Permalink
core/namespace: s/normalize_mounts()/drop_unused_mounts()
Browse files Browse the repository at this point in the history
Rename the normalize_mounts() helper to drop_unused_mounts. All the
helper called in there drop mounts that are unused for a variety of
reasons. But the helper it self speaks of "normalizing" mounts which
sounds like paths are simplified etc. Make it more obvious what it does
by renaming it and by documenting it.

Link: systemd#22206
  • Loading branch information
brauner committed Jan 24, 2022
1 parent 1361f01 commit 94809ae
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/core/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,14 @@ static size_t namespace_calculate_mounts(
ns_info->private_ipc; /* /dev/mqueue */
}

static void normalize_mounts(const char *root_directory, MountEntry *mounts, size_t *n_mounts) {
/* Walk all mount entries and dropping any unused mounts. This affects all
* mounts:
* - that are implicitly protected by a path that has been rendered inaccessible
* - whose immediate parent requests the same protection mode as the mount itself
* - that are outside of the relevant root directory
* - which are duplicates
*/
static void drop_unused_mounts(const char *root_directory, MountEntry *mounts, size_t *n_mounts) {
assert(root_directory);
assert(n_mounts);
assert(mounts || *n_mounts == 0);
Expand Down Expand Up @@ -1684,7 +1691,7 @@ static int apply_mounts(
if (!again)
break;

normalize_mounts(root, mounts, n_mounts);
drop_unused_mounts(root, mounts, n_mounts);
}

/* Now that all filesystems have been set up, but before the
Expand Down Expand Up @@ -2250,7 +2257,7 @@ int setup_namespace(
if (r < 0)
goto finish;

normalize_mounts(root, mounts, &n_mounts);
drop_unused_mounts(root, mounts, &n_mounts);
}

/* All above is just preparation, figuring out what to do. Let's now actually start doing something. */
Expand Down

0 comments on commit 94809ae

Please sign in to comment.