Fix tsk->exit_state usage

270f722d · Eugene Teo <[email protected]> · 2007-10-18 23:40:38 -07:00

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 <[email protected]>
Cc: Roland McGrath <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 270f722d4d5f94b02fd48eed47e57917ab00a858
Parents: d85f50d5

Changes

3 files changed · +3 −4

File	Status	Add	Del	Content
fs/proc/array.c	modified	+1	−2	View file
kernel/fork.c	modified	+1	−1	View file
kernel/sched.c	modified	+1	−1	View file

fs/proc/array.c

View file

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 04b689f..7a34571 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -146,8 +146,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) {

kernel/fork.c

View file

diff --git a/kernel/fork.c b/kernel/fork.c
index a794bfc..240aa66 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -117,7 +117,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);
 

kernel/sched.c

View file

diff --git a/kernel/sched.c b/kernel/sched.c
index 72a809a..9d45850 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5279,7 +5279,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);