signals: collect_signal: simplify the "still_pending" logic
PATCH 2/2 signals: collect_signal: simplify the "still_pending" logic
Factor out sigdelset() calls and remove the "still_pending" variable.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/signal.c renamed from kernel/signal.c~8_CLEANUP_STILL_PENDING +6 -8
@@ -307,7 +307,6 @@ unblock_all_signals(void)static int collect_signal (int sig,struct sigpending *list,siginfo_t *info) {struct sigqueue *q, *first =NULL ; -int still_pending =0 ;/* * Collect the siginfo appropriate to this signal. Check if
@@ -315,16 +314,16 @@ static int collect_signal(int sig, struc*/ list_for_each_entry (q, &list->list, list) {if (q->info.si_signo == sig) { -if (first) { - still_pending =1 ; -break ; - } +if (first) + goto still_pending; first = q; } } + +sigdelset (&list->signal, sig); +if (first) { -if (!still_pending) -sigdelset (&list->signal, sig); +still_pending:if (unlikely (first->flags &SIGQUEUE_CANCELLED )) sig =0 ;copy_siginfo (info, &first->info);
@@ -336,7 +335,6 @@ static int collect_signal(int sig, struca fast-pathed signal or we must have been out of queue space. So zero out the info. */ -sigdelset (&list->signal, sig); info->si_signo = sig; info->si_errno =0 ; info->si_code =0 ;
Quoted 1 line
Factor out
sigdelset()calls and remove the "still_pending" variable.
Acked-by Roland McGrath <[email protected]>