Skip to content

Commit

Permalink
signals: turn LEGACY_QUEUE macro into static inline function
Browse files Browse the repository at this point in the history
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: Pavel Emelyanov <xemul@openvz.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Pavel Emelyanov authored and Linus Torvalds committed Apr 30, 2008
1 parent e1401c6 commit af7fff9
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
struct sigpending *signals)
{
Expand Down Expand Up @@ -721,9 +726,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
return 0;
}

#define LEGACY_QUEUE(sigptr, sig) \
(((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig)))

int print_fatal_signals;

static void print_fatal_signal(struct pt_regs *regs, int signr)
Expand Down Expand Up @@ -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
can get more detailed information about the cause of
the signal. */
if (LEGACY_QUEUE(&t->pending, sig))
if (legacy_queue(&t->pending, sig))
goto out;

ret = send_signal(sig, info, t, &t->pending);
Expand Down Expand Up @@ -932,7 +934,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
if (sig_ignored(p, sig))
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. */
return ret;

Expand Down

0 comments on commit af7fff9

Please sign in to comment.