dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

coredump_wait: don't call complete_vfork_done() 

Now that CLONE_VFORK is killable, coredump_wait() no longer needs
complete_vfork_done().  zap_threads() should find and kill all tasks with
the same ->mm, this includes our parent if ->vfork_done is set.

mm_release() becomes the only caller, unexport complete_vfork_done().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov 2012-03-05 14:59:13 -08:00 committed by Linus Torvalds
parent d68b46fe16
commit 57b59c4a14
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/exec.c
View File

@ -1926,19 +1926,9 @@ static int coredump_wait(int exit_code, struct core_state *core_state)
core_waiters = zap_threads(tsk, mm, core_state, exit_code);
up_write(&mm->mmap_sem);
if (unlikely(core_waiters < 0))
goto fail;
/*
* Make sure nobody is waiting for us to release the VM,
* otherwise we can deadlock when we wait on each other
*/
if (tsk->vfork_done)
complete_vfork_done(tsk);
if (core_waiters)
if (core_waiters > 0)
wait_for_completion(&core_state->startup);
fail:
return core_waiters;
}

1
include/linux/sched.h
View File

@ -2291,7 +2291,6 @@ extern int do_execve(const char *,
const char __user * const __user *,
const char __user * const __user *, struct pt_regs *);
extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
extern void complete_vfork_done(struct task_struct *tsk);
struct task_struct *fork_idle(int);
extern void set_task_comm(struct task_struct *tsk, char *from);

2
kernel/fork.c
View File

@ -668,7 +668,7 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
return mm;
}
void complete_vfork_done(struct task_struct *tsk)
static void complete_vfork_done(struct task_struct *tsk)
{
struct completion *vfork;