diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 13:35:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 13:35:18 -0800 |
| commit | 444f378b237a0f728f5c4aba752c08d13c209344 (patch) | |
| tree | 248fd00bb2e60cb0890fce38b6a66fed65f977e4 /kernel/fork.c | |
| parent | 8c8c4bafc3a20a6fb9078315ff865bc42276f9ba (diff) | |
| download | linux-444f378b237a0f728f5c4aba752c08d13c209344.tar.gz linux-444f378b237a0f728f5c4aba752c08d13c209344.tar.bz2 linux-444f378b237a0f728f5c4aba752c08d13c209344.zip | |
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/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 4cf868458f06..fc723e595cd5 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1265,7 +1265,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, return p; bad_fork_cleanup_namespaces: - put_and_finalize_nsproxy(p->nsproxy); + exit_task_namespaces(p); bad_fork_cleanup_keys: exit_keys(p); bad_fork_cleanup_mm: @@ -1711,7 +1711,7 @@ asmlinkage long sys_unshare(unsigned long unshare_flags) } if (new_nsproxy) - put_and_finalize_nsproxy(new_nsproxy); + put_nsproxy(new_nsproxy); bad_unshare_cleanup_ipc: if (new_ipc) |