Commit 100360f0 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

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: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4434207
...@@ -338,7 +338,7 @@ unblock_all_signals(void) ...@@ -338,7 +338,7 @@ unblock_all_signals(void)
spin_unlock_irqrestore(&current->sighand->siglock, flags); spin_unlock_irqrestore(&current->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; struct sigqueue *q, *first = NULL;
...@@ -372,7 +372,6 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info) ...@@ -372,7 +372,6 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
info->si_pid = 0; info->si_pid = 0;
info->si_uid = 0; info->si_uid = 0;
} }
return 1;
} }
static int __dequeue_signal(struct sigpending *pending, sigset_t *mask, static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
...@@ -390,8 +389,7 @@ 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)) collect_signal(sig, pending, info);
sig = 0;
} }
return sig; return sig;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment