lkml.org 
[lkml]   [2012]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] unshare: remove dead code
Date
From: Alan Cox <alan@linux.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@linux.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);


\
 
 \ /
  Last update: 2012-10-27 10:21    [W:0.024 / U:0.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site