rename __exit_sighand to cleanup_sighand
Subsystems (3)
PATCH 4/4 rename __exit_sighand to cleanup_sighand
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 <[email protected]>
include/linux/sched.h renamed from include/linux/sched.h~4_ESGH +1 -1
@@ -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);
kernel/fork.c renamed from kernel/fork.c~4_ESGH +11 -1
@@ -801,6 +801,16 @@ static inline int copy_sighand(unsignedreturn 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:
kernel/signal.c renamed from kernel/signal.c~4_ESGH +2 -17
@@ -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 ();
Quoted 5 lines · Oleg Nesterov
Cosmetic, rename
__exit_sighandtocleanup_sighandand move it close tocopy_sighand().This matches copy_signal/cleanup_signal naming, and I think it is easier to follow.
Passes steamroller, looks sane, but defer to others on the relative desireability of the names. (Yes, I am a philistine!)
Acked-by <[email protected]>
Quoted 83 lines
Signed-off-by Oleg Nesterov <[email protected]>include/linux/sched.h renamed from include/linux/sched.h~4_ESGH +1
-1@@ -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);kernel/fork.c renamed from kernel/fork.c~4_ESGH +11
-1@@ -801,6 +801,16 @@ static inline int copy_sighand(unsignedreturn 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:kernel/signal.c renamed from kernel/signal.c~4_ESGH +2
-17@@ -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 ();