diff options
author | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2013-02-21 19:44:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:22:26 -0500 |
commit | d7d48f6216686602e6e3d8470563326605b01c95 (patch) | |
tree | e4f10dd9fdce684d57ba33829fa9cf5094001744 /kernel | |
parent | d3330cf08ccf9aef28a3e5740fd5cc7ac536db84 (diff) |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 78e2ecb20165..b781e66a8f2c 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c | |||
@@ -153,8 +153,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk) | |||
153 | goto out; | 153 | goto out; |
154 | } | 154 | } |
155 | 155 | ||
156 | new_ns = create_new_namespaces(flags, tsk, | 156 | new_ns = create_new_namespaces(flags, tsk, user_ns, tsk->fs); |
157 | task_cred_xxx(tsk, user_ns), tsk->fs); | ||
158 | if (IS_ERR(new_ns)) { | 157 | if (IS_ERR(new_ns)) { |
159 | err = PTR_ERR(new_ns); | 158 | err = PTR_ERR(new_ns); |
160 | goto out; | 159 | goto out; |