From 84a1e453a37fd84e163c763488420b7a1e8f7f79 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 23 Nov 2005 13:37:43 -0800 Subject: [PATCH] --- yaml --- r: 14649 b: refs/heads/master c: 962b564cf1ec8041e8890a3c3847e3a630a08f42 h: refs/heads/master i: 14647: feb7d2ee7c062a64361c2d0b225820f82be3f93d v: v3 --- [refs] | 2 +- trunk/fs/exec.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4df7d048862a..fc8a0ea98532 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bf1101bd52573e0573e374d56d2feecdbb5e444 +refs/heads/master: 962b564cf1ec8041e8890a3c3847e3a630a08f42 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index c466fec5de20..1f8a9fd2c9ed 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -668,7 +668,7 @@ static inline int de_thread(struct task_struct *tsk) if (!thread_group_leader(current)) { struct task_struct *parent; struct dentry *proc_dentry1, *proc_dentry2; - unsigned long exit_state, ptrace; + unsigned long ptrace; /* * Wait for the thread group leader to be a zombie. @@ -726,15 +726,15 @@ static inline int de_thread(struct task_struct *tsk) list_del(¤t->tasks); list_add_tail(¤t->tasks, &init_task.tasks); current->exit_signal = SIGCHLD; - exit_state = leader->exit_state; + + BUG_ON(leader->exit_state != EXIT_ZOMBIE); + leader->exit_state = EXIT_DEAD; write_unlock_irq(&tasklist_lock); spin_unlock(&leader->proc_lock); spin_unlock(¤t->proc_lock); proc_pid_flush(proc_dentry1); proc_pid_flush(proc_dentry2); - - BUG_ON(exit_state != EXIT_ZOMBIE); } /*