From: Oleg Nesterov <oleg@tv-sign.ru>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
"Paul E. McKenney" <paulmck@us.ibm.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Roland McGrath <roland@redhat.com>
Subject: [PATCH 4/4] rename __exit_sighand to cleanup_sighand
Date: Mon, 20 Feb 2006 19:04:32 +0300 [thread overview]
Message-ID: <43F9E890.B8550676@tv-sign.ru> (raw)
Cosmetic, rename __exit_sighand to cleanup_sighand and move
it close to copy_sighand().
This matches copy_signal/cleanup_signal naming, and I think
it is easier to follow.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
--- 2.6.16-rc3/include/linux/sched.h~4_ESGH 2006-02-20 02:01:27.000000000 +0300
+++ 2.6.16-rc3/include/linux/sched.h 2006-02-20 21:00:09.000000000 +0300
@@ -1142,8 +1142,8 @@ extern void exit_thread(void);
extern void exit_files(struct task_struct *);
extern void __cleanup_signal(struct signal_struct *);
+extern void cleanup_sighand(struct task_struct *);
extern void __exit_signal(struct task_struct *);
-extern void __exit_sighand(struct task_struct *);
extern void exit_itimers(struct signal_struct *);
extern NORET_TYPE void do_group_exit(int);
--- 2.6.16-rc3/kernel/fork.c~4_ESGH 2006-02-20 02:02:38.000000000 +0300
+++ 2.6.16-rc3/kernel/fork.c 2006-02-20 21:14:25.000000000 +0300
@@ -801,6 +801,16 @@ static inline int copy_sighand(unsigned
return 0;
}
+void cleanup_sighand(struct task_struct *tsk)
+{
+ struct sighand_struct * sighand = tsk->sighand;
+
+ /* Ok, we're done with the signal handlers */
+ tsk->sighand = NULL;
+ if (atomic_dec_and_test(&sighand->count))
+ kmem_cache_free(sighand_cachep, sighand);
+}
+
static inline int copy_signal(unsigned long clone_flags, struct task_struct * tsk)
{
struct signal_struct *sig;
@@ -1212,7 +1222,7 @@ bad_fork_cleanup_mm:
bad_fork_cleanup_signal:
cleanup_signal(p);
bad_fork_cleanup_sighand:
- __exit_sighand(p);
+ cleanup_sighand(p);
bad_fork_cleanup_fs:
exit_fs(p); /* blocking */
bad_fork_cleanup_files:
--- 2.6.16-rc3/kernel/signal.c~4_ESGH 2006-02-20 20:55:50.000000000 +0300
+++ 2.6.16-rc3/kernel/signal.c 2006-02-20 21:06:49.000000000 +0300
@@ -310,9 +310,7 @@ static void flush_sigqueue(struct sigpen
/*
* Flush all pending signals for a task.
*/
-
-void
-flush_signals(struct task_struct *t)
+void flush_signals(struct task_struct *t)
{
unsigned long flags;
@@ -326,19 +324,6 @@ flush_signals(struct task_struct *t)
/*
* This function expects the tasklist_lock write-locked.
*/
-void __exit_sighand(struct task_struct *tsk)
-{
- struct sighand_struct * sighand = tsk->sighand;
-
- /* Ok, we're done with the signal handlers */
- tsk->sighand = NULL;
- if (atomic_dec_and_test(&sighand->count))
- kmem_cache_free(sighand_cachep, sighand);
-}
-
-/*
- * This function expects the tasklist_lock write-locked.
- */
void __exit_signal(struct task_struct *tsk)
{
struct signal_struct *sig = tsk->signal;
@@ -386,7 +371,7 @@ void __exit_signal(struct task_struct *t
}
tsk->signal = NULL;
- __exit_sighand(tsk);
+ cleanup_sighand(tsk);
spin_unlock(&sighand->siglock);
rcu_read_unlock();
next reply other threads:[~2006-02-20 14:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-20 16:04 Oleg Nesterov [this message]
2006-02-24 18:04 ` Paul E. McKenney
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=43F9E890.B8550676@tv-sign.ru \
--to=oleg@tv-sign.ru \
--cc=akpm@osdl.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulmck@us.ibm.com \
--cc=roland@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®