summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorYuanhan Liu <yuanhan.liu@linux.intel.com>2013-02-21 16:44:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 17:22:26 -0800
commitd7d48f6216686602e6e3d8470563326605b01c95 (patch)
treee4f10dd9fdce684d57ba33829fa9cf5094001744 /kernel
parentd3330cf08ccf9aef28a3e5740fd5cc7ac536db84 (diff)
downloadop-kernel-dev-d7d48f6216686602e6e3d8470563326605b01c95.zip
op-kernel-dev-d7d48f6216686602e6e3d8470563326605b01c95.tar.gz
kernel/nsproxy.c: remove duplicate task_cred_xxx for user_ns
We can use user_ns, which is also assigned from task_cred_xxx(tsk, user_ns), at the beginning of copy_namespaces(). Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/nsproxy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 78e2ecb..b781e66 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -153,8 +153,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
goto out;
}
- new_ns = create_new_namespaces(flags, tsk,
- task_cred_xxx(tsk, user_ns), tsk->fs);
+ new_ns = create_new_namespaces(flags, tsk, user_ns, tsk->fs);
if (IS_ERR(new_ns)) {
err = PTR_ERR(new_ns);
goto out;
OpenPOWER on IntegriCloud