1 files changed, 4 insertions, 6 deletions

diff --git a/fs/pnode.c b/fs/pnode.c
index 8b29d2164da6..3d2a7141b87a 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -218,7 +218,7 @@ static struct mount *get_source(struct mount *dest,
  * @source_mnt: source mount.
  * @tree_list : list of heads of trees to be attached.
  */
-int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
+int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp,
                     struct mount *source_mnt, struct list_head *tree_list)
 {
         struct user_namespace *user_ns = current->nsproxy->mnt_ns->user_ns;
@@ -227,7 +227,6 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
         struct mount *prev_dest_mnt = dest_mnt;
         struct mount *prev_src_mnt  = source_mnt;
         LIST_HEAD(tmp_list);
-        LIST_HEAD(umount_list);
 
         for (m = propagation_next(dest_mnt, dest_mnt); m;
                         m = propagation_next(m, dest_mnt)) {
@@ -250,8 +249,8 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
                         goto out;
                 }
 
-                if (is_subdir(dest_dentry, m->mnt.mnt_root)) {
-                        mnt_set_mountpoint(m, dest_dentry, child);
+                if (is_subdir(dest_mp->m_dentry, m->mnt.mnt_root)) {
+                        mnt_set_mountpoint(m, dest_mp, child);
                         list_add_tail(&child->mnt_hash, tree_list);
                 } else {
                         /*
@@ -267,10 +266,9 @@ out:
         br_write_lock(&vfsmount_lock);
         while (!list_empty(&tmp_list)) {
                 child = list_first_entry(&tmp_list, struct mount, mnt_hash);
-                umount_tree(child, 0, &umount_list);
+                umount_tree(child, 0);
         }
         br_write_unlock(&vfsmount_lock);
-        release_mounts(&umount_list);
         return ret;
 }