Merge remote-tracking branch 'arc-current/for-curr'

[karo-tx-linux.git] / fs / pnode.c

diff --git a/fs/pnode.c b/fs/pnode.c
index 8b29d2164da6aef6edb88b9872368c849e658530..9af0df15256e9405082fdb59d1a2c6fe97fb8e59 100644 (file)
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -83,7 +83,8 @@ static int do_make_slave(struct mount *mnt)
                if (peer_mnt == mnt)
                        peer_mnt = NULL;
        }
-       if (IS_MNT_SHARED(mnt) && list_empty(&mnt->mnt_share))
+       if (mnt->mnt_group_id && IS_MNT_SHARED(mnt) &&
+           list_empty(&mnt->mnt_share))
                mnt_release_group_id(mnt);
 
        list_del_init(&mnt->mnt_share);
@@ -218,7 +219,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 +228,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 +250,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 +267,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;
 }