forked from luck/tmp_suning_uos_patched
wait: completely ignore the EXIT_DEAD tasks
Now that EXIT_DEAD is the terminal state it doesn't make sense to call eligible_child() or security_task_wait() if the task is really dead. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Tested-by: Michal Schmidt <mschmidt@redhat.com> Cc: Jan Kratochvil <jan.kratochvil@redhat.com> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Lennart Poettering <lpoetter@redhat.com> Cc: Roland McGrath <roland@hack.frob.com> Cc: 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:
parent
b436069059
commit
b3ab03160d
|
@ -1329,7 +1329,12 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
|
||||||
static int wait_consider_task(struct wait_opts *wo, int ptrace,
|
static int wait_consider_task(struct wait_opts *wo, int ptrace,
|
||||||
struct task_struct *p)
|
struct task_struct *p)
|
||||||
{
|
{
|
||||||
int ret = eligible_child(wo, p);
|
int ret;
|
||||||
|
|
||||||
|
if (unlikely(p->exit_state == EXIT_DEAD))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
ret = eligible_child(wo, p);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -1347,10 +1352,6 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* dead body doesn't have much to contribute */
|
|
||||||
if (unlikely(p->exit_state == EXIT_DEAD))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (unlikely(p->exit_state == EXIT_TRACE)) {
|
if (unlikely(p->exit_state == EXIT_TRACE)) {
|
||||||
/*
|
/*
|
||||||
* ptrace == 0 means we are the natural parent. In this case
|
* ptrace == 0 means we are the natural parent. In this case
|
||||||
|
|
Loading…
Reference in New Issue
Block a user