Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 5424e37673ed0fc5df510c5a03db31e50fba5dae..d6a00f3de15d59b3e1bcb8ebcc32373e447df180 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -201,10 +201,6 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
                goto out;
        }
 
-       err = ns_cgroup_clone(current, task_pid(current));
-       if (err)
-               put_nsproxy(*new_nsp);
-
 out:
        return err;
 }