Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932407AbWBXSB2 (ORCPT ); Fri, 24 Feb 2006 13:01:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932408AbWBXSB2 (ORCPT ); Fri, 24 Feb 2006 13:01:28 -0500 Received: from e1.ny.us.ibm.com ([32.97.182.141]:59311 "EHLO e1.ny.us.ibm.com") by vger.kernel.org with ESMTP id S932407AbWBXSB2 (ORCPT ); Fri, 24 Feb 2006 13:01:28 -0500 Date: Fri, 24 Feb 2006 10:01:54 -0800 From: "Paul E. McKenney" To: Oleg Nesterov Cc: Andrew Morton , linux-kernel@vger.kernel.org, Ingo Molnar , "Eric W. Biederman" , Roland McGrath Subject: Re: [PATCH 3/4] cleanup __exit_signal() Message-ID: <20060224180154.GB1735@us.ibm.com> Reply-To: paulmck@us.ibm.com References: <43F9E873.808CD086@tv-sign.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <43F9E873.808CD086@tv-sign.ru> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2559 Lines: 81 On Mon, Feb 20, 2006 at 07:04:03PM +0300, Oleg Nesterov wrote: > This patch factors out duplicated code under 'if' branches. > Also, BUG_ON() conversions and whitespace cleanups. Passed steamroller. Looks sane to me. Thanx, Paul Acked-by: > Signed-off-by: Oleg Nesterov > > --- 2.6.16-rc3/kernel/signal.c~3_ESIG 2006-02-20 02:02:03.000000000 +0300 > +++ 2.6.16-rc3/kernel/signal.c 2006-02-20 20:55:50.000000000 +0300 > @@ -341,24 +341,20 @@ void __exit_sighand(struct task_struct * > */ > void __exit_signal(struct task_struct *tsk) > { > - struct signal_struct * sig = tsk->signal; > - struct sighand_struct * sighand; > + struct signal_struct *sig = tsk->signal; > + struct sighand_struct *sighand; > + > + BUG_ON(!sig); > + BUG_ON(!atomic_read(&sig->count)); > > - if (!sig) > - BUG(); > - if (!atomic_read(&sig->count)) > - BUG(); > rcu_read_lock(); > sighand = rcu_dereference(tsk->sighand); > spin_lock(&sighand->siglock); > + > posix_cpu_timers_exit(tsk); > - if (atomic_dec_and_test(&sig->count)) { > + if (atomic_dec_and_test(&sig->count)) > posix_cpu_timers_exit_group(tsk); > - tsk->signal = NULL; > - __exit_sighand(tsk); > - spin_unlock(&sighand->siglock); > - flush_sigqueue(&sig->shared_pending); > - } else { > + else { > /* > * If there is any task waiting for the group exit > * then notify it: > @@ -369,7 +365,6 @@ void __exit_signal(struct task_struct *t > } > if (tsk == sig->curr_target) > sig->curr_target = next_thread(tsk); > - tsk->signal = NULL; > /* > * Accumulate here the counters for all threads but the > * group leader as they die, so they can be added into > @@ -387,14 +382,18 @@ void __exit_signal(struct task_struct *t > sig->nvcsw += tsk->nvcsw; > sig->nivcsw += tsk->nivcsw; > sig->sched_time += tsk->sched_time; > - __exit_sighand(tsk); > - spin_unlock(&sighand->siglock); > - sig = NULL; /* Marker for below. */ > + sig = NULL; /* Marker for below. */ > } > + > + tsk->signal = NULL; > + __exit_sighand(tsk); > + spin_unlock(&sighand->siglock); > rcu_read_unlock(); > + > clear_tsk_thread_flag(tsk,TIF_SIGPENDING); > flush_sigqueue(&tsk->pending); > if (sig) { > + flush_sigqueue(&sig->shared_pending); > __cleanup_signal(sig); > } > } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/