X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Fnsproxy.c;h=21575fc46d0597914d4b92b5749c53f59f9be4e1;hb=419ca3f13532793b81aff09f80c60af3eacbb43d;hp=adc785146a1cb81d6f7b3d676877921f10bb59e7;hpb=59d42c0eb1d8fdfeec18f4ff088de8084bda906b;p=linux-2.6-microblaze.git

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index adc785146a1c..21575fc46d05 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -157,12 +157,6 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
 		goto out;
 	}
 
-	err = ns_cgroup_clone(tsk);
-	if (err) {
-		put_nsproxy(new_ns);
-		goto out;
-	}
-
 	tsk->nsproxy = new_ns;
 
 out:
@@ -209,7 +203,7 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
 		goto out;
 	}
 
-	err = ns_cgroup_clone(current);
+	err = ns_cgroup_clone(current, task_pid(current));
 	if (err)
 		put_nsproxy(*new_nsp);