diff options
Diffstat (limited to 'kernel/nsproxy.c')
| -rw-r--r-- | kernel/nsproxy.c | 8 | 
1 files changed, 1 insertions, 7 deletions
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) | |||
| 157 | goto out; | 157 | goto out; | 
| 158 | } | 158 | } | 
| 159 | 159 | ||
| 160 | err = ns_cgroup_clone(tsk); | ||
| 161 | if (err) { | ||
| 162 | put_nsproxy(new_ns); | ||
| 163 | goto out; | ||
| 164 | } | ||
| 165 | |||
| 166 | tsk->nsproxy = new_ns; | 160 | tsk->nsproxy = new_ns; | 
| 167 | 161 | ||
| 168 | out: | 162 | out: | 
| @@ -209,7 +203,7 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags, | |||
| 209 | goto out; | 203 | goto out; | 
| 210 | } | 204 | } | 
| 211 | 205 | ||
| 212 | err = ns_cgroup_clone(current); | 206 | err = ns_cgroup_clone(current, task_pid(current)); | 
| 213 | if (err) | 207 | if (err) | 
| 214 | put_nsproxy(*new_nsp); | 208 | put_nsproxy(*new_nsp); | 
| 215 | 209 | ||
