[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20121025142539.16724.76390.stgit@localhost.localdomain>
Date: Thu, 25 Oct 2012 15:25:54 +0100
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: linux-kernel@...r.kernel.org, akpm@...ux-foundation.org
Subject: [PATCH] unshare: remove dead code
From: Alan Cox <alan@...ux.intel.com>
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 <alan@...ux.intel.com>
---
kernel/fork.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/kernel/fork.c b/kernel/fork.c
index acc4cb6..60854b2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1792,10 +1792,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);
@@ -1819,9 +1817,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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists