From 239e7f01ab904505819aee9a79b0963d7462e402 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 23 Sep 2009 15:56:45 -0700 Subject: [PATCH] --- yaml --- r: 165673 b: refs/heads/master c: a2322e1d272938d192d8c24cdacf57c0c7a2683f h: refs/heads/master i: 165671: 7256f45b0eb7cd6eb02f9f9ef9886b42bbc7d8c5 v: v3 --- [refs] | 2 +- trunk/kernel/exit.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 74dd88701a90..4282ca08d56c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7f0765edfd53aed09cb7b0e15863688b39447de +refs/heads/master: a2322e1d272938d192d8c24cdacf57c0c7a2683f diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 782b2e1f7ca2..ef2dfa818bf1 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -1112,8 +1112,6 @@ static struct pid *task_pid_type(struct task_struct *task, enum pid_type type) static int eligible_child(struct wait_opts *wo, struct task_struct *p) { - int err; - if (wo->wo_type < PIDTYPE_MAX) { if (task_pid_type(p, wo->wo_type) != wo->wo_pid) return 0; @@ -1128,10 +1126,6 @@ static int eligible_child(struct wait_opts *wo, struct task_struct *p) && !(wo->wo_flags & __WALL)) return 0; - err = security_task_wait(p); - if (err) - return err; - return 1; } @@ -1492,6 +1486,7 @@ static int wait_consider_task(struct wait_opts *wo, struct task_struct *parent, if (!ret) return ret; + ret = security_task_wait(p); if (unlikely(ret < 0)) { /* * If we have not yet seen any eligible child,