Commit a7e5328a authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] cleanup __exit_signal->cleanup_sighand path



Move 'tsk->sighand = NULL' from cleanup_sighand() to __exit_signal().  This
makes the exit path more understandable and allows us to do
cleanup_sighand() outside of ->siglock protected section.
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4a2c7a78
...@@ -1151,7 +1151,7 @@ extern void exit_thread(void); ...@@ -1151,7 +1151,7 @@ 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 __cleanup_sighand(struct sighand_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);
......
...@@ -114,10 +114,11 @@ static void __exit_signal(struct task_struct *tsk) ...@@ -114,10 +114,11 @@ static void __exit_signal(struct task_struct *tsk)
__unhash_process(tsk); __unhash_process(tsk);
tsk->signal = NULL; tsk->signal = NULL;
cleanup_sighand(tsk); tsk->sighand = NULL;
spin_unlock(&sighand->siglock); spin_unlock(&sighand->siglock);
rcu_read_unlock(); rcu_read_unlock();
__cleanup_sighand(sighand);
clear_tsk_thread_flag(tsk,TIF_SIGPENDING); clear_tsk_thread_flag(tsk,TIF_SIGPENDING);
flush_sigqueue(&tsk->pending); flush_sigqueue(&tsk->pending);
if (sig) { if (sig) {
......
...@@ -803,12 +803,8 @@ static inline int copy_sighand(unsigned long clone_flags, struct task_struct * t ...@@ -803,12 +803,8 @@ static inline int copy_sighand(unsigned long clone_flags, struct task_struct * t
return 0; return 0;
} }
void cleanup_sighand(struct task_struct *tsk) void __cleanup_sighand(struct sighand_struct *sighand)
{ {
struct sighand_struct * sighand = tsk->sighand;
/* Ok, we're done with the signal handlers */
tsk->sighand = NULL;
if (atomic_dec_and_test(&sighand->count)) if (atomic_dec_and_test(&sighand->count))
kmem_cache_free(sighand_cachep, sighand); kmem_cache_free(sighand_cachep, sighand);
} }
...@@ -1233,7 +1229,7 @@ static task_t *copy_process(unsigned long clone_flags, ...@@ -1233,7 +1229,7 @@ static task_t *copy_process(unsigned long clone_flags,
bad_fork_cleanup_signal: bad_fork_cleanup_signal:
cleanup_signal(p); cleanup_signal(p);
bad_fork_cleanup_sighand: bad_fork_cleanup_sighand:
cleanup_sighand(p); __cleanup_sighand(p->sighand);
bad_fork_cleanup_fs: bad_fork_cleanup_fs:
exit_fs(p); /* blocking */ exit_fs(p); /* blocking */
bad_fork_cleanup_files: bad_fork_cleanup_files:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment