aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2007-10-17 02:27:22 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:53 -0400
commit0840a90d943bcde2fbfeabd3c256236eed2273cd (patch)
treed423a5b7576f6ba35494aac06c97c6c21dac9bcf
parent2b47c3611de05c585e2d81204f6c7e3e255a3461 (diff)
exec: simplify ->sighand switching
There is no any reason to do recalc_sigpending() after changing ->sighand. To begin with, recalc_sigpending() does not take ->sighand into account. This means we don't need to take newsighand->siglock while changing sighands. rcu_assign_pointer() provides a necessary barrier, and if another process reads the new ->sighand it should either take tasklist_lock or it should use lock_task_sighand() which has a corresponding smp_read_barrier_depends(). Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/exec.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 59c0038baa4f..7f325df5e014 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -916,12 +916,7 @@ no_thread_group:
916 916
917 write_lock_irq(&tasklist_lock); 917 write_lock_irq(&tasklist_lock);
918 spin_lock(&oldsighand->siglock); 918 spin_lock(&oldsighand->siglock);
919 spin_lock_nested(&newsighand->siglock, SINGLE_DEPTH_NESTING);
920
921 rcu_assign_pointer(tsk->sighand, newsighand); 919 rcu_assign_pointer(tsk->sighand, newsighand);
922 recalc_sigpending();
923
924 spin_unlock(&newsighand->siglock);
925 spin_unlock(&oldsighand->siglock); 920 spin_unlock(&oldsighand->siglock);
926 write_unlock_irq(&tasklist_lock); 921 write_unlock_irq(&tasklist_lock);
927 922
@@ -931,12 +926,11 @@ no_thread_group:
931 BUG_ON(!thread_group_leader(tsk)); 926 BUG_ON(!thread_group_leader(tsk));
932 return 0; 927 return 0;
933} 928}
934 929
935/* 930/*
936 * These functions flushes out all traces of the currently running executable 931 * These functions flushes out all traces of the currently running executable
937 * so that a new one can be started 932 * so that a new one can be started
938 */ 933 */
939
940static void flush_old_files(struct files_struct * files) 934static void flush_old_files(struct files_struct * files)
941{ 935{
942 long j = -1; 936 long j = -1;