diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2007-10-16 23:27:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:42:52 -0700 |
| commit | 715015e8da37c4d13e234def054bcbea116297e9 (patch) | |
| tree | 3c3f2cd1d516d13d50ad33519dfe98a75243eb0d | |
| parent | 18442cf28af81378cf8996d264b368bba47cf846 (diff) | |
| download | op-kernel-dev-715015e8da37c4d13e234def054bcbea116297e9.zip op-kernel-dev-715015e8da37c4d13e234def054bcbea116297e9.tar.gz | |
wait_task_stopped/continued: remove unneeded p->signal != NULL check
The child was found on ->children list under tasklist_lock, it must have a
valid ->signal. __exit_signal() both removes the task from parent->children
and clears ->signal "atomically" under write_lock(tasklist).
Remove unneeded checks.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/exit.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index b27a3dcd..25f6805 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1322,7 +1322,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, if (!p->exit_code) return 0; if (delayed_group_leader && !(p->ptrace & PT_PTRACED) && - p->signal && p->signal->group_stop_count > 0) + p->signal->group_stop_count > 0) /* * A group stop is in progress and this is the group leader. * We won't report until all threads have stopped. @@ -1436,9 +1436,6 @@ static int wait_task_continued(struct task_struct *p, int noreap, pid_t pid; uid_t uid; - if (unlikely(!p->signal)) - return 0; - if (!(p->signal->flags & SIGNAL_STOP_CONTINUED)) return 0; |
