signals: join send_sigqueue() with send_group_sigqueue()
PATCH 6/6 signals: join send_sigqueue() with send_group_sigqueue()
We export send_sigqueue() and send_group_sigqueue() for the only user, posix_timer_event(). This is a bit silly, because both are just trivial helpers on top of do_send_sigqueue() and because the we pass the unused .si_signo parameter.
Kill them both, rename do_send_sigqueue() to send_sigqueue(), and export it.
Signed-off-by Oleg Nesterov <[email protected]>
include/linux/sched.h | 3 +-- kernel/signal.c | 15 +-------------- kernel/posix-timers.c | 6 ++---- 3 files changed, 4 insertions(+), 20 deletions(-)
include/linux/sched.h renamed from include/linux/sched.h~6_SSQ_UNIFY +1 -2
@@ -1708,8 +1708,7 @@ extern void zap_other_threads(struct tasextern int kill_proc (pid_t ,int ,int );extern struct sigqueue *sigqueue_alloc (void );extern void sigqueue_free (struct sigqueue *); -extern int send_sigqueue (int ,struct sigqueue *,struct task_struct *); -extern int send_group_sigqueue (int ,struct sigqueue *,struct task_struct *); +extern int send_sigqueue (struct sigqueue *,struct task_struct *,int group);extern int do_sigaction (int ,struct k_sigaction *,struct k_sigaction *);extern int do_sigaltstack (const stack_t __user *,stack_t __user *,unsigned long );
kernel/signal.c renamed from kernel/signal.c~6_SSQ_UNIFY +1 -14
@@ -1240,8 +1240,7 @@ void sigqueue_free(struct sigqueue *q)__sigqueue_free (q); } -static int do_send_sigqueue (struct sigqueue *q,struct task_struct *t, -int group) +int send_sigqueue (struct sigqueue *q,struct task_struct *t,int group) {int sig = q->info.si_signo;struct sigpending *pending;
@@ -1266,7 +1265,6 @@ static int do_send_sigqueue(struct sigqu* If an SI_TIMER entry is already queue just increment * the overrun count. */ -BUG_ON (q->info.si_code !=SI_TIMER ); q->info.si_overrun++; goto out;
@@ -1283,17 +1281,6 @@ ret:return ret; } -int send_sigqueue (int sig,struct sigqueue *q,struct task_struct *p) -{ -return do_send_sigqueue (q, p,0 ); -} - -int -send_group_sigqueue (int sig,struct sigqueue *q,struct task_struct *p) -{ -return do_send_sigqueue (q, p,1 ); -} -/* * Wake up any threads in the parent blocked in wait* syscalls. */
kernel/posix-timers.c renamed from kernel/posix-timers.c~6_SSQ_UNIFY +2 -4
@@ -311,8 +311,7 @@ int posix_timer_event(struct k_itimer *tif (timr->it_sigev_notify &SIGEV_THREAD_ID ) {struct task_struct *leader; -int ret =send_sigqueue (timr->it_sigev_signo, timr->sigq, - timr->it_process); +int ret =send_sigqueue (timr->sigq, timr->it_process,0 );if (likely (ret >=0 ))return ret;
@@ -323,8 +322,7 @@ int posix_timer_event(struct k_itimer *t timr->it_process = leader; } -return send_group_sigqueue (timr->it_sigev_signo, timr->sigq, - timr->it_process); +return send_sigqueue (timr->sigq, timr->it_process,1 ); }EXPORT_SYMBOL_GPL (posix_timer_event);
Looks good to me.