Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755289AbXHSOYU (ORCPT ); Sun, 19 Aug 2007 10:24:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753108AbXHSOYL (ORCPT ); Sun, 19 Aug 2007 10:24:11 -0400 Received: from mx1.redhat.com ([66.187.233.31]:35419 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255AbXHSOYK (ORCPT ); Sun, 19 Aug 2007 10:24:10 -0400 Date: Sun, 19 Aug 2007 22:24:01 +0800 From: Eugene Teo To: Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [PATCH] Fix tsk->exit_state usage (resend) Message-ID: <20070819142401.GA27823@kernel.sg> Reply-To: Eugene Teo MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1920 Lines: 57 tsk->exit_state can only be 0, EXIT_ZOMBIE, or EXIT_DEAD. A non-zero test is the same as tsk->exit_state & (EXIT_ZOMBIE | EXIT_DEAD), so just testing tsk->exit_state is sufficient. Signed-off-by: Eugene Teo --- fs/proc/array.c | 3 +-- kernel/fork.c | 2 +- kernel/sched.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/proc/array.c b/fs/proc/array.c index 965625a..babb24d 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -145,8 +145,7 @@ static inline const char *get_task_state(struct task_struct *tsk) TASK_UNINTERRUPTIBLE | TASK_STOPPED | TASK_TRACED)) | - (tsk->exit_state & (EXIT_ZOMBIE | - EXIT_DEAD)); + tsk->exit_state; const char **p = &task_state_array[0]; while (state) { diff --git a/kernel/fork.c b/kernel/fork.c index 7332e23..56d1b8b 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -115,7 +115,7 @@ EXPORT_SYMBOL(free_task); void __put_task_struct(struct task_struct *tsk) { - WARN_ON(!(tsk->exit_state & (EXIT_DEAD | EXIT_ZOMBIE))); + WARN_ON(!tsk->exit_state); WARN_ON(atomic_read(&tsk->usage)); WARN_ON(tsk == current); diff --git a/kernel/sched.c b/kernel/sched.c index 45e17b8..8c27f08 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5190,7 +5190,7 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p) struct rq *rq = cpu_rq(dead_cpu); /* Must be exiting, otherwise would be on tasklist. */ - BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD); + BUG_ON(!p->exit_state); /* Cannot have done final schedule yet: would have vanished. */ BUG_ON(p->state == TASK_DEAD); - 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/