attach_recursive_mnt(): pass destination mount in all cases

... and 'beneath' is no longer used there

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namespace.c b/fs/namespace.c
index 9b8d07df4aa5d2457184eb4d80407e767c4ed672..449e66436b4f1d6212ceafec5fb0005256dbc6c3 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2570,7 +2570,7 @@ enum mnt_tree_flags_t {
 /**
  * attach_recursive_mnt - attach a source mount tree
  * @source_mnt: mount tree to be attached
- * @top_mnt:    mount that @source_mnt will be mounted on or mounted beneath
+ * @dest_mnt:   mount that @source_mnt will be mounted on
  * @dest_mp:    the mountpoint @source_mnt will be mounted at
  * @flags:      modify how @source_mnt is supposed to be attached
  *
@@ -2635,20 +2635,20 @@ enum mnt_tree_flags_t {
  *         Otherwise a negative error code is returned.
  */
 static int attach_recursive_mnt(struct mount *source_mnt,
-                               struct mount *top_mnt,
+                               struct mount *dest_mnt,
                                struct mountpoint *dest_mp,
                                enum mnt_tree_flags_t flags)
 {
        struct user_namespace *user_ns = current->nsproxy->mnt_ns->user_ns;
        HLIST_HEAD(tree_list);
-       struct mnt_namespace *ns = top_mnt->mnt_ns;
+       struct mnt_namespace *ns = dest_mnt->mnt_ns;
        struct mountpoint *smp;
        struct mountpoint *shorter = NULL;
-       struct mount *child, *dest_mnt, *p;
+       struct mount *child, *p;
        struct mount *top;
        struct hlist_node *n;
        int err = 0;
-       bool moving = flags & MNT_TREE_MOVE, beneath = flags & MNT_TREE_BENEATH;
+       bool moving = flags & MNT_TREE_MOVE;
 
        /*
         * Preallocate a mountpoint in case the new mounts need to be
@@ -2669,11 +2669,6 @@ static int attach_recursive_mnt(struct mount *source_mnt,
                        goto out;
        }
 
-       if (beneath)
-               dest_mnt = top_mnt->mnt_parent;
-       else
-               dest_mnt = top_mnt;
-
        if (IS_MNT_SHARED(dest_mnt)) {
                err = invent_group_ids(source_mnt, true);
                if (err)
@@ -3688,7 +3683,7 @@ static int do_move_mount(struct path *old_path,
        if (mount_is_ancestor(old, p))
                goto out;
 
-       err = attach_recursive_mnt(old, real_mount(new_path->mnt), mp, flags);
+       err = attach_recursive_mnt(old, p, mp, flags);
        if (err)
                goto out;