From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753604Ab3AVKUx (ORCPT ); Tue, 22 Jan 2013 05:20:53 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:21157 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753122Ab3AVKUv (ORCPT ); Tue, 22 Jan 2013 05:20:51 -0500 From: Andrey Vagin To: linux-kernel@vger.kernel.org Cc: criu@openvz.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, Andrey Vagin , Ingo Molnar , Peter Zijlstra , Serge Hallyn , Oleg Nesterov , Andrew Morton , "Eric W. Biederman" , Al Viro , Pavel Emelyanov , Cyrill Gorcunov , Michael Kerrisk Subject: [PATCH 1/3] signal: add a helper for dequeuing signals from a specified queue Date: Tue, 22 Jan 2013 14:15:39 +0400 Message-Id: <1358849741-9611-2-git-send-email-avagin@openvz.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358849741-9611-1-git-send-email-avagin@openvz.org> References: <1358849741-9611-1-git-send-email-avagin@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Serge Hallyn Cc: Oleg Nesterov Cc: Andrew Morton Cc: "Eric W. Biederman" Cc: Al Viro Cc: Pavel Emelyanov CC: Cyrill Gorcunov Cc: Michael Kerrisk Signed-off-by: Andrey Vagin --- include/linux/sched.h | 13 ++++++++++++- kernel/signal.c | 10 ++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 206bb08..45871f1 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2221,7 +2221,18 @@ extern void flush_signals(struct task_struct *); extern void __flush_signals(struct task_struct *); extern void ignore_signals(struct task_struct *); extern void flush_signal_handlers(struct task_struct *, int force_default); -extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info); + +#define SIGQUEUE_SHARED 1 +#define SIGQUEUE_PRIVATE 2 +extern int do_dequeue_signal(struct task_struct *tsk, + sigset_t *mask, siginfo_t *info, int qmask); + +static inline int dequeue_signal(struct task_struct *tsk, + sigset_t *mask, siginfo_t *info) +{ + return do_dequeue_signal(tsk, mask, info, + SIGQUEUE_SHARED | SIGQUEUE_PRIVATE); +} static inline int dequeue_signal_lock(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) { diff --git a/kernel/signal.c b/kernel/signal.c index ac5f5e7..1412f6a 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -600,15 +600,17 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask, * * All callers have to hold the siglock. */ -int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) +int do_dequeue_signal(struct task_struct *tsk, sigset_t *mask, + siginfo_t *info, int qmask) { - int signr; + int signr = 0; /* We only dequeue private signals from ourselves, we don't let * signalfd steal them */ - signr = __dequeue_signal(&tsk->pending, mask, info); - if (!signr) { + if (qmask & SIGQUEUE_PRIVATE) + signr = __dequeue_signal(&tsk->pending, mask, info); + if (!signr && (qmask & SIGQUEUE_SHARED)) { signr = __dequeue_signal(&tsk->signal->shared_pending, mask, info); /* -- 1.7.11.7