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

Commit 0a76fe8e authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

do_wait: remove one "else if" branch 



Minor cleanup. We can remove one "else if" branch.

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Roland 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 f10db627

kernel/exit.c

+1 −3
Original line number Diff line number Diff line
@@ -1590,8 +1590,6 @@ static long do_wait(pid_t pid, int options, struct siginfo __user *infop, 
					goto repeat;

				if (retval != 0) /* He released the lock.  */

					goto end;

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

				continue;

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

				/*

				 * Eligible but we cannot release it yet:
@@ -1606,7 +1604,7 @@ static long do_wait(pid_t pid, int options, struct siginfo __user *infop, 
				/* He released the lock.  */

				if (retval != 0)

					goto end;

			} else {

			} else if (p->exit_state != EXIT_DEAD) {

check_continued:

				/*

				 * It's running now, so it might later