[PATCH] 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 <oleg@tv-sign.ru> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: "Paul E. McKenney" <paulmck@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
29ff471234
commit
c81addc9d3
|
@ -1150,8 +1150,8 @@ extern void exit_thread(void);
|
||||||
|
|
||||||
extern void exit_files(struct task_struct *);
|
extern void exit_files(struct task_struct *);
|
||||||
extern void __cleanup_signal(struct signal_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_signal(struct task_struct *);
|
||||||
extern void __exit_sighand(struct task_struct *);
|
|
||||||
extern void exit_itimers(struct signal_struct *);
|
extern void exit_itimers(struct signal_struct *);
|
||||||
|
|
||||||
extern NORET_TYPE void do_group_exit(int);
|
extern NORET_TYPE void do_group_exit(int);
|
||||||
|
|
|
@ -803,6 +803,16 @@ static inline int copy_sighand(unsigned long clone_flags, struct task_struct * t
|
||||||
return 0;
|
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)
|
static inline int copy_signal(unsigned long clone_flags, struct task_struct * tsk)
|
||||||
{
|
{
|
||||||
struct signal_struct *sig;
|
struct signal_struct *sig;
|
||||||
|
@ -1224,7 +1234,7 @@ bad_fork_cleanup_mm:
|
||||||
bad_fork_cleanup_signal:
|
bad_fork_cleanup_signal:
|
||||||
cleanup_signal(p);
|
cleanup_signal(p);
|
||||||
bad_fork_cleanup_sighand:
|
bad_fork_cleanup_sighand:
|
||||||
__exit_sighand(p);
|
cleanup_sighand(p);
|
||||||
bad_fork_cleanup_fs:
|
bad_fork_cleanup_fs:
|
||||||
exit_fs(p); /* blocking */
|
exit_fs(p); /* blocking */
|
||||||
bad_fork_cleanup_files:
|
bad_fork_cleanup_files:
|
||||||
|
|
|
@ -310,9 +310,7 @@ static void flush_sigqueue(struct sigpending *queue)
|
||||||
/*
|
/*
|
||||||
* Flush all pending signals for a task.
|
* Flush all pending signals for a task.
|
||||||
*/
|
*/
|
||||||
|
void flush_signals(struct task_struct *t)
|
||||||
void
|
|
||||||
flush_signals(struct task_struct *t)
|
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
@ -323,19 +321,6 @@ flush_signals(struct task_struct *t)
|
||||||
spin_unlock_irqrestore(&t->sighand->siglock, flags);
|
spin_unlock_irqrestore(&t->sighand->siglock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* 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.
|
* This function expects the tasklist_lock write-locked.
|
||||||
*/
|
*/
|
||||||
|
@ -386,7 +371,7 @@ void __exit_signal(struct task_struct *tsk)
|
||||||
}
|
}
|
||||||
|
|
||||||
tsk->signal = NULL;
|
tsk->signal = NULL;
|
||||||
__exit_sighand(tsk);
|
cleanup_sighand(tsk);
|
||||||
spin_unlock(&sighand->siglock);
|
spin_unlock(&sighand->siglock);
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
||||||
|
|
Reference in New Issue