diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2011-06-22 23:09:39 +0200 |
|---|---|---|
| committer | Oleg Nesterov <oleg@redhat.com> | 2011-06-27 20:30:09 +0200 |
| commit | 0976a03e5ce8ec346e985f21046d7a75bb7fdffd (patch) | |
| tree | 347ab2fa51689226d734b288f330b5ad16997d8e | |
| parent | 8677347378044ab564470bced2275520efb3670d (diff) | |
| download | op-kernel-dev-0976a03e5ce8ec346e985f21046d7a75bb7fdffd.zip op-kernel-dev-0976a03e5ce8ec346e985f21046d7a75bb7fdffd.tar.gz | |
reparent_leader: check EXIT_DEAD instead of task_detached()
Change reparent_leader() to check ->exit_state instead of ->exit_signal,
this matches the similar EXIT_DEAD check in wait_consider_task() and
allows us to cleanup the do_notify_parent/task_detached logic.
task_detached() was really needed during reparenting before 9cd80bbb
"do_wait() optimization: do not place sub-threads on ->children list"
to filter out the sub-threads. After this change task_detached(p) can
only be true if p is the dead group_leader and its parent ignores
SIGCHLD, in this case the caller of do_notify_parent() is going to
reap this task and it should set EXIT_DEAD.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index f68d137..2b1ba80 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -742,7 +742,7 @@ static void reparent_leader(struct task_struct *father, struct task_struct *p, { list_move_tail(&p->sibling, &p->real_parent->children); - if (task_detached(p)) + if (p->exit_state == EXIT_DEAD) return; /* * If this is a threaded reparent there is no need to |
