Commit 6f977e6b authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

fork: unshare: remove dead code

If new_nsproxy is set we will always call switch_task_namespaces and
then set new_nsproxy back to NULL so the reassignment and fall through
check are redundant
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5e62adef
...@@ -1861,10 +1861,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) ...@@ -1861,10 +1861,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
exit_sem(current); exit_sem(current);
} }
if (new_nsproxy) { if (new_nsproxy)
switch_task_namespaces(current, new_nsproxy); switch_task_namespaces(current, new_nsproxy);
new_nsproxy = NULL;
}
task_lock(current); task_lock(current);
...@@ -1894,9 +1892,6 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) ...@@ -1894,9 +1892,6 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
} }
} }
if (new_nsproxy)
put_nsproxy(new_nsproxy);
bad_unshare_cleanup_cred: bad_unshare_cleanup_cred:
if (new_cred) if (new_cred)
put_cred(new_cred); put_cred(new_cred);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment