From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
David Woodhouse <dwmw2@infradead.org>,
Richard Weinberger <richard@nod.at>, Tejun Heo <tj@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 05/11] signals: cleanup the usage of t/current in do_sigaction()
Date: Sun, 23 Mar 2014 20:37:56 +0100 [thread overview]
Message-ID: <20140323193756.GA10498@redhat.com> (raw)
In-Reply-To: <20140323193730.GA10464@redhat.com>
The usage of "task_struct *t" and "current" in do_sigaction() looks
really annoying and chaotic. Initially "t" is used as a cached value
of current but not consistently, then it is reused as a loop variable
and we have to use "current" again.
Cleanup this mess and also convert the code to use for_each_thread().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/signal.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index d8d8b23..37b2858 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3065,16 +3065,16 @@ COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo,
int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
{
- struct task_struct *t = current;
+ struct task_struct *p = current, *t;
struct k_sigaction *k;
sigset_t mask;
if (!valid_signal(sig) || sig < 1 || (act && sig_kernel_only(sig)))
return -EINVAL;
- k = &t->sighand->action[sig-1];
+ k = &p->sighand->action[sig-1];
- spin_lock_irq(¤t->sighand->siglock);
+ spin_lock_irq(&p->sighand->siglock);
if (oact)
*oact = *k;
@@ -3093,17 +3093,16 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
* (for example, SIGCHLD), shall cause the pending signal to
* be discarded, whether or not it is blocked"
*/
- if (sig_handler_ignored(sig_handler(t, sig), sig)) {
+ if (sig_handler_ignored(sig_handler(p, sig), sig)) {
sigemptyset(&mask);
sigaddset(&mask, sig);
- flush_sigqueue_mask(&mask, &t->signal->shared_pending);
- do {
+ flush_sigqueue_mask(&mask, &p->signal->shared_pending);
+ for_each_thread(p, t)
flush_sigqueue_mask(&mask, &t->pending);
- } while_each_thread(current, t);
}
}
- spin_unlock_irq(¤t->sighand->siglock);
+ spin_unlock_irq(&p->sighand->siglock);
return 0;
}
--
1.5.5.1
next prev parent reply other threads:[~2014-03-23 19:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-23 19:37 [PATCH 00/11] cleanup/fix allow_signal/disallow_signal Oleg Nesterov
2014-03-23 19:37 ` [PATCH 01/11] signals: kill sigfindinword() Oleg Nesterov
2014-03-24 12:21 ` Geert Uytterhoeven
2014-03-24 18:07 ` Oleg Nesterov
2014-03-23 19:37 ` [PATCH 02/11] signals: s/siginitset/sigemptyset/ in do_sigtimedwait() Oleg Nesterov
2014-03-23 19:37 ` [PATCH 03/11] signals: kill rm_from_queue(), change prepare_signal() to use for_each_thread() Oleg Nesterov
2014-03-23 19:37 ` [PATCH 04/11] signals: rename rm_from_queue_full() to flush_sigqueue_mask() Oleg Nesterov
2014-03-23 19:37 ` Oleg Nesterov [this message]
2014-03-23 19:37 ` [PATCH 06/11] signals: mv {dis,}allow_signal() from sched.h/exit.c to signal.[ch] Oleg Nesterov
2014-03-23 19:38 ` [PATCH 07/11] signals: jffs2: fix the wrong usage of disallow_signal() Oleg Nesterov
2014-03-23 19:38 ` [PATCH 08/11] signals: kill the obsolete sigdelset() and recalc_sigpending() in allow_signal() Oleg Nesterov
2014-03-23 19:38 ` [PATCH 09/11] signals: disallow_signal() should flush the potentially pending signal Oleg Nesterov
2014-03-23 19:38 ` [PATCH 10/11] signals: introduce kernel_sigaction() Oleg Nesterov
2014-03-23 19:38 ` [PATCH 11/11] signals: change wait_for_helper() to use kernel_sigaction() Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140323193756.GA10498@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=richard@nod.at \
--cc=tj@kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.