diff options
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r-- | kernel/nsproxy.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index adc785146a1c..1d3ef29a2583 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c | |||
@@ -14,7 +14,6 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/version.h> | ||
18 | #include <linux/nsproxy.h> | 17 | #include <linux/nsproxy.h> |
19 | #include <linux/init_task.h> | 18 | #include <linux/init_task.h> |
20 | #include <linux/mnt_namespace.h> | 19 | #include <linux/mnt_namespace.h> |
@@ -157,12 +156,6 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk) | |||
157 | goto out; | 156 | goto out; |
158 | } | 157 | } |
159 | 158 | ||
160 | err = ns_cgroup_clone(tsk); | ||
161 | if (err) { | ||
162 | put_nsproxy(new_ns); | ||
163 | goto out; | ||
164 | } | ||
165 | |||
166 | tsk->nsproxy = new_ns; | 159 | tsk->nsproxy = new_ns; |
167 | 160 | ||
168 | out: | 161 | out: |
@@ -209,7 +202,7 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags, | |||
209 | goto out; | 202 | goto out; |
210 | } | 203 | } |
211 | 204 | ||
212 | err = ns_cgroup_clone(current); | 205 | err = ns_cgroup_clone(current, task_pid(current)); |
213 | if (err) | 206 | if (err) |
214 | put_nsproxy(*new_nsp); | 207 | put_nsproxy(*new_nsp); |
215 | 208 | ||