From 03adfb573474a3f420db2fad3435e694f0a7b00a Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 22 Jun 2011 23:09:54 +0200
Subject: [PATCH] --- yaml --- r: 256856 b: refs/heads/master c:
 e550f14dc6322e794d4e70825f63c9c99177ae8b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 5 -----
 trunk/kernel/exit.c         | 5 ++---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index da8412fe70a4..62e1e5ac6926 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0976a03e5ce8ec346e985f21046d7a75bb7fdffd
+refs/heads/master: e550f14dc6322e794d4e70825f63c9c99177ae8b
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 0cb4f097f76c..39acee2c8929 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -2318,11 +2318,6 @@ static inline int thread_group_empty(struct task_struct *p)
 #define delay_group_leader(p) \
 		(thread_group_leader(p) && !thread_group_empty(p))
 
-static inline int task_detached(struct task_struct *p)
-{
-	return p->exit_signal == -1;
-}
-
 /*
  * Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring
  * subscriptions and synchronises with wait4().  Also used in procfs.  Also
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 2b1ba8048a14..9fa99702645d 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -189,7 +189,6 @@ void release_task(struct task_struct * p)
 	zap_leader = 0;
 	leader = p->group_leader;
 	if (leader != p && thread_group_empty(leader) && leader->exit_state == EXIT_ZOMBIE) {
-		BUG_ON(task_detached(leader));
 		/*
 		 * If we were the last child thread and the leader has
 		 * exited already, and the leader's parent ignores SIGCHLD,
@@ -1231,9 +1230,9 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
 	traced = ptrace_reparented(p);
 	/*
 	 * It can be ptraced but not reparented, check
-	 * !task_detached() to filter out sub-threads.
+	 * thread_group_leader() to filter out sub-threads.
 	 */
-	if (likely(!traced) && likely(!task_detached(p))) {
+	if (likely(!traced) && thread_group_leader(p)) {
 		struct signal_struct *psig;
 		struct signal_struct *sig;
 		unsigned long maxrss;