Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[deliverable/linux.git] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index e2ce748e96afaca08cf0e5b2821d4cf6e8cab823..f5b9ee6f6bbb02733cef1e64fabe4dc521efc767 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -46,10 +46,8 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
        struct nsproxy *ns;
 
        ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
-       if (ns) {
+       if (ns)
                atomic_set(&ns->count, 1);
-               ns->id = -1;
-       }
        return ns;
 }