From b7e4fc7cd14b016b6ef73d0b1b6069fe73e2e3ca Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 9 Nov 2012 14:05:04 +1100 Subject: [PATCH] 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: Alan Cox Signed-off-by: Andrew Morton --- kernel/fork.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index 6e32287883dc..58088f9034a9 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1835,10 +1835,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) exit_sem(current); } - if (new_nsproxy) { + if (new_nsproxy) switch_task_namespaces(current, new_nsproxy); - new_nsproxy = NULL; - } task_lock(current); @@ -1862,9 +1860,6 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) task_unlock(current); } - if (new_nsproxy) - put_nsproxy(new_nsproxy); - bad_unshare_cleanup_fd: if (new_fd) put_files_struct(new_fd); -- 2.39.5