git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pidns: remove now unused kill_proc function
[pandora-kernel.git]
/
kernel
/
nsproxy.c
diff --git
a/kernel/nsproxy.c
b/kernel/nsproxy.c
index
adc7851
..
21575fc
100644
(file)
--- a/
kernel/nsproxy.c
+++ b/
kernel/nsproxy.c
@@
-157,12
+157,6
@@
int copy_namespaces(unsigned long flags, struct task_struct *tsk)
goto out;
}
goto out;
}
- err = ns_cgroup_clone(tsk);
- if (err) {
- put_nsproxy(new_ns);
- goto out;
- }
-
tsk->nsproxy = new_ns;
out:
tsk->nsproxy = new_ns;
out:
@@
-209,7
+203,7
@@
int unshare_nsproxy_namespaces(unsigned long unshare_flags,
goto out;
}
goto out;
}
- err = ns_cgroup_clone(current);
+ err = ns_cgroup_clone(current
, task_pid(current)
);
if (err)
put_nsproxy(*new_nsp);
if (err)
put_nsproxy(*new_nsp);