diff options
author | Oleg Nesterov <oleg@redhat.com> | 2011-06-22 17:09:54 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2011-06-27 14:30:09 -0400 |
commit | e550f14dc6322e794d4e70825f63c9c99177ae8b (patch) | |
tree | 64f918a0d70f82842211a3c0d54ca658877b5b5d /kernel/exit.c | |
parent | 0976a03e5ce8ec346e985f21046d7a75bb7fdffd (diff) |
kill task_detached()
Upadate the last user of task_detached(), wait_task_zombie(), to
use thread_group_leader() and kill task_detached().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 2b1ba8048a14..9fa99702645d 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -189,7 +189,6 @@ repeat: | |||
189 | zap_leader = 0; | 189 | zap_leader = 0; |
190 | leader = p->group_leader; | 190 | leader = p->group_leader; |
191 | if (leader != p && thread_group_empty(leader) && leader->exit_state == EXIT_ZOMBIE) { | 191 | if (leader != p && thread_group_empty(leader) && leader->exit_state == EXIT_ZOMBIE) { |
192 | BUG_ON(task_detached(leader)); | ||
193 | /* | 192 | /* |
194 | * If we were the last child thread and the leader has | 193 | * If we were the last child thread and the leader has |
195 | * exited already, and the leader's parent ignores SIGCHLD, | 194 | * exited already, and the leader's parent ignores SIGCHLD, |
@@ -1231,9 +1230,9 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p) | |||
1231 | traced = ptrace_reparented(p); | 1230 | traced = ptrace_reparented(p); |
1232 | /* | 1231 | /* |
1233 | * It can be ptraced but not reparented, check | 1232 | * It can be ptraced but not reparented, check |
1234 | * !task_detached() to filter out sub-threads. | 1233 | * thread_group_leader() to filter out sub-threads. |
1235 | */ | 1234 | */ |
1236 | if (likely(!traced) && likely(!task_detached(p))) { | 1235 | if (likely(!traced) && thread_group_leader(p)) { |
1237 | struct signal_struct *psig; | 1236 | struct signal_struct *psig; |
1238 | struct signal_struct *sig; | 1237 | struct signal_struct *sig; |
1239 | unsigned long maxrss; | 1238 | unsigned long maxrss; |