summaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 13:35:18 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 13:35:18 -0800
commit444f378b237a0f728f5c4aba752c08d13c209344 (patch)
tree248fd00bb2e60cb0890fce38b6a66fed65f977e4 /kernel/exit.c
parent8c8c4bafc3a20a6fb9078315ff865bc42276f9ba (diff)
downloadop-kernel-dev-444f378b237a0f728f5c4aba752c08d13c209344.zip
op-kernel-dev-444f378b237a0f728f5c4aba752c08d13c209344.tar.gz
Revert "[PATCH] namespaces: fix exit race by splitting exit"
This reverts commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5 in preparation for a better and simpler fix proposed by Eric Biederman (and fixed up by Serge Hallyn) Acked-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index a5bf532..3540172 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -396,7 +396,7 @@ void daemonize(const char *name, ...)
current->fs = fs;
atomic_inc(&fs->count);
- put_and_finalize_nsproxy(current->nsproxy);
+ exit_task_namespaces(current);
current->nsproxy = init_task.nsproxy;
get_task_namespaces(current);
@@ -853,7 +853,6 @@ static void exit_notify(struct task_struct *tsk)
fastcall NORET_TYPE void do_exit(long code)
{
struct task_struct *tsk = current;
- struct nsproxy *ns;
int group_dead;
profile_task_exit(tsk);
@@ -939,9 +938,8 @@ fastcall NORET_TYPE void do_exit(long code)
tsk->exit_code = code;
proc_exit_connector(tsk);
- ns = preexit_task_namespaces(tsk);
exit_notify(tsk);
- exit_task_namespaces(tsk, ns);
+ exit_task_namespaces(tsk);
#ifdef CONFIG_NUMA
mpol_free(tsk->mempolicy);
tsk->mempolicy = NULL;
OpenPOWER on IntegriCloud