signals: change collect_signal() to return void
With the recent changes collect_signal() always returns true. Change it to return void and update the single caller. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d443420761
commit
100360f030
@ -338,7 +338,7 @@ unblock_all_signals(void)
|
||||
spin_unlock_irqrestore(¤t->sighand->siglock, flags);
|
||||
}
|
||||
|
||||
static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
|
||||
static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
|
||||
{
|
||||
struct sigqueue *q, *first = NULL;
|
||||
|
||||
@ -372,7 +372,6 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
|
||||
info->si_pid = 0;
|
||||
info->si_uid = 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
|
||||
@ -390,8 +389,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
|
||||
}
|
||||
}
|
||||
|
||||
if (!collect_signal(sig, pending, info))
|
||||
sig = 0;
|
||||
collect_signal(sig, pending, info);
|
||||
}
|
||||
|
||||
return sig;
|
||||
|
Loading…
Reference in New Issue
Block a user