Commit af7fff9c authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds

signals: turn LEGACY_QUEUE macro into static inline function

This makes the code more readable, due to less brackets and small letters in
name.

I also move it above the send_signal() as a preparation for the 3rd patch.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg 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 e1401c6b
...@@ -657,6 +657,11 @@ static void handle_stop_signal(int sig, struct task_struct *p) ...@@ -657,6 +657,11 @@ static void handle_stop_signal(int sig, struct task_struct *p)
} }
} }
static inline int legacy_queue(struct sigpending *signals, int sig)
{
return (sig < SIGRTMIN) && sigismember(&signals->signal, sig);
}
static int send_signal(int sig, struct siginfo *info, struct task_struct *t, static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
struct sigpending *signals) struct sigpending *signals)
{ {
...@@ -721,9 +726,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, ...@@ -721,9 +726,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
return 0; return 0;
} }
#define LEGACY_QUEUE(sigptr, sig) \
(((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig)))
int print_fatal_signals; int print_fatal_signals;
static void print_fatal_signal(struct pt_regs *regs, int signr) static void print_fatal_signal(struct pt_regs *regs, int signr)
...@@ -771,7 +773,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) ...@@ -771,7 +773,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
/* Support queueing exactly one non-rt signal, so that we /* Support queueing exactly one non-rt signal, so that we
can get more detailed information about the cause of can get more detailed information about the cause of
the signal. */ the signal. */
if (LEGACY_QUEUE(&t->pending, sig)) if (legacy_queue(&t->pending, sig))
goto out; goto out;
ret = send_signal(sig, info, t, &t->pending); ret = send_signal(sig, info, t, &t->pending);
...@@ -932,7 +934,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) ...@@ -932,7 +934,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
if (sig_ignored(p, sig)) if (sig_ignored(p, sig))
return ret; return ret;
if (LEGACY_QUEUE(&p->signal->shared_pending, sig)) if (legacy_queue(&p->signal->shared_pending, sig))
/* This is a non-RT signal and we already have one queued. */ /* This is a non-RT signal and we already have one queued. */
return ret; return ret;
......
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