don't bother passing new_path->dentry to can_move_mount_beneath()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namespace.c b/fs/namespace.c
index 8c5f5b1edcedc2c8f945bc4a16edd74c6f79f225..b48bfb46b351d1ae91241a3b7cc1c950cf233329 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3445,8 +3445,8 @@ static bool mount_is_ancestor(const struct mount *p1, const struct mount *p2)
 /**
  * can_move_mount_beneath - check that we can mount beneath the top mount
  * @mnt_from: mount we are trying to move
- * @to:   mount under which to mount
- * @mp:   mountpoint of @to
+ * @mnt_to:   mount under which to mount
+ * @mp:   mountpoint of @mnt_to
  *
  * - Make sure that nothing can be mounted beneath the caller's current
  *   root or the rootfs of the namespace.
@@ -3462,11 +3462,10 @@ static bool mount_is_ancestor(const struct mount *p1, const struct mount *p2)
  * Return: On success 0, and on error a negative error code is returned.
  */
 static int can_move_mount_beneath(struct mount *mnt_from,
-                                 const struct path *to,
+                                 struct mount *mnt_to,
                                  const struct mountpoint *mp)
 {
-       struct mount *mnt_to = real_mount(to->mnt),
-                    *parent_mnt_to = mnt_to->mnt_parent;
+       struct mount *parent_mnt_to = mnt_to->mnt_parent;
 
        if (IS_MNT_LOCKED(mnt_to))
                return -EINVAL;
@@ -3613,7 +3612,9 @@ static int do_move_mount(struct path *old_path,
        }
 
        if (beneath) {
-               err = can_move_mount_beneath(old, new_path, mp.mp);
+               struct mount *over = real_mount(new_path->mnt);
+
+               err = can_move_mount_beneath(old, over, mp.mp);
                if (err)
                        return err;
        }