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

Commit 27d91e07 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

[PATCH] __dequeue_signal() cleanup 



This tightens up __dequeue_signal a little.  It also avoids doing
recalc_sigpending twice in a row, instead doing it once in dequeue_signal.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b9ecb2bd

kernel/signal.c

+2 −4
Original line number Diff line number Diff line
@@ -417,9 +417,8 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info) 
static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,

			siginfo_t *info)

{

	int sig = 0;

	int sig = next_signal(pending, mask);



	sig = next_signal(pending, mask);

	if (sig) {

		if (current->notifier) {

			if (sigismember(current->notifier_mask, sig)) {
@@ -432,9 +431,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask, 


		if (!collect_signal(sig, pending, info))

			sig = 0;

				

	}

	recalc_sigpending();



	return sig;

}
@@ -451,6 +448,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) 
	if (!signr)

		signr = __dequeue_signal(&tsk->signal->shared_pending,

					 mask, info);

	recalc_sigpending_tsk(tsk);

 	if (signr && unlikely(sig_kernel_stop(signr))) {

 		/*

 		 * Set a marker that we have dequeued a stop signal.  Our