Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / fs / pnode.c

diff --git a/fs/pnode.c b/fs/pnode.c
index 1100e810d855f724222fab4095687d02e1aa4d25..7ea6cfb6507784662bbe957c61fde3dd76df0528 100644 (file)
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -214,7 +214,6 @@ static struct mount *next_group(struct mount *m, struct mount *origin)
 }
 
 /* all accesses are serialized by namespace_sem */
-static struct user_namespace *user_ns;
 static struct mount *last_dest, *first_source, *last_source, *dest_master;
 static struct mountpoint *mp;
 static struct hlist_head *list;
@@ -260,9 +259,6 @@ static int propagate_one(struct mount *m)
                        type |= CL_MAKE_SHARED;
        }
                
-       /* Notice when we are propagating across user namespaces */
-       if (m->mnt_ns->user_ns != user_ns)
-               type |= CL_UNPRIVILEGED;
        child = copy_tree(last_source, last_source->mnt.mnt_root, type);
        if (IS_ERR(child))
                return PTR_ERR(child);
@@ -303,7 +299,6 @@ int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp,
         * propagate_one(); everything is serialized by namespace_sem,
         * so globals will do just fine.
         */
-       user_ns = current->nsproxy->mnt_ns->user_ns;
        last_dest = dest_mnt;
        first_source = source_mnt;
        last_source = source_mnt;