]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
kernel/nsproxy.c: remove duplicate task_cred_xxx for user_ns
authorYuanhan Liu <yuanhan.liu@linux.intel.com>
Fri, 22 Feb 2013 00:44:21 +0000 (16:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Feb 2013 01:22:26 +0000 (17:22 -0800)
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>
kernel/nsproxy.c

index 78e2ecb201655575dceef87cd9f8c771547bcfb7..b781e66a8f2c4fca3943f2441f7d19296128f525 100644 (file)
@@ -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;