Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bad95c3 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

wait_task_stopped(): remove unneeded delay_group_leader check 



wait_task_stopped() doesn't need the "delay_group_leader" parameter.  If
the child is not traced it must be a group leader.  With or without
subthreads ->group_stop_count == 0 when the whole task is stopped.

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Mika Penttila <mika.penttila@kolumbus.fi>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 20686a30

kernel/exit.c

+3 −4
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ static int wait_task_zombie(struct task_struct *p, int noreap, 
 * the lock and this task is uninteresting.  If we return nonzero, we have

 * released the lock and the system call should return.

 */

static int wait_task_stopped(struct task_struct *p, int delayed_group_leader,

static int wait_task_stopped(struct task_struct *p,

			     int noreap, struct siginfo __user *infop,

			     int __user *stat_addr, struct rusage __user *ru)

{
@@ -1365,8 +1365,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, 
	if (unlikely(!task_is_stopped_or_traced(p)))

		goto unlock_sig;



	if (delayed_group_leader && !(p->ptrace & PT_PTRACED) &&

	    p->signal->group_stop_count > 0)

	if (!(p->ptrace & PT_PTRACED) && 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.
@@ -1522,7 +1521,7 @@ static long do_wait(pid_t pid, int options, struct siginfo __user *infop, 
				    !(options & WUNTRACED))

					continue;



				retval = wait_task_stopped(p, ret == 2,

				retval = wait_task_stopped(p,

						(options & WNOWAIT), infop,

						stat_addr, ru);

			} else if (p->exit_state == EXIT_ZOMBIE) {