diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2025-06-17 21:10:02 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2025-06-29 18:13:41 -0400 |
| commit | 1a867d729f951f1f0ef73c94d2f739f959cd8699 (patch) | |
| tree | 45caadabb5aa1390822e784dc92538daab31e2ab /fs/namespace.c | |
| parent | 9ed4b9eaeaa71cb0db4ec8460b5edd390aef58dd (diff) | |
__attach_mnt(): lose the second argument
It's always ->mnt_parent of the first one. What the function does is
making a mount (with already set parent and mountpoint) visible - in
mount hash and in the parent's list of children.
IOW, it takes the existing rootwards linkage and sets the matching
crownwards linkage.
Renamed to make_visible(), while we are at it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 151d5f3360b9..75d45d0b615c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1079,8 +1079,9 @@ void mnt_set_mountpoint(struct mount *mnt, hlist_add_head(&child_mnt->mnt_mp_list, &mp->m_list); } -static void __attach_mnt(struct mount *mnt, struct mount *parent) +static void make_visible(struct mount *mnt) { + struct mount *parent = mnt->mnt_parent; if (unlikely(mnt->mnt_mountpoint == parent->mnt.mnt_root)) parent->overmount = mnt; hlist_add_head_rcu(&mnt->mnt_hash, @@ -1098,7 +1099,7 @@ static void __attach_mnt(struct mount *mnt, struct mount *parent) * Mount @mnt at @mp on @parent. Then attach @mnt * to @parent's child mount list and to @mount_hashtable. * - * Note, when __attach_mnt() is called @mnt->mnt_parent already points + * Note, when make_visible() is called @mnt->mnt_parent already points * to the correct parent. * * Context: This function expects namespace_lock() and lock_mount_hash() @@ -1108,7 +1109,7 @@ static void attach_mnt(struct mount *mnt, struct mount *parent, struct mountpoint *mp) { mnt_set_mountpoint(parent, mp, mnt); - __attach_mnt(mnt, mnt->mnt_parent); + make_visible(mnt); } void mnt_change_mountpoint(struct mount *parent, struct mountpoint *mp, struct mount *mnt) @@ -1182,7 +1183,7 @@ static void commit_tree(struct mount *mnt) n->nr_mounts += n->pending_mounts; n->pending_mounts = 0; - __attach_mnt(mnt, parent); + make_visible(mnt); touch_mnt_namespace(n); } @@ -2679,7 +2680,7 @@ static int attach_recursive_mnt(struct mount *source_mnt, mnt_set_mountpoint(dest_mnt, dest_mp, source_mnt); if (beneath) mnt_change_mountpoint(top, smp, top_mnt); - __attach_mnt(source_mnt, source_mnt->mnt_parent); + make_visible(source_mnt); mnt_notify_add(source_mnt); touch_mnt_namespace(source_mnt->mnt_ns); } else { |