From 4a88212df9bdfbf6c6d3719307528a50f46bdb66 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Sun, 30 Oct 2005 15:01:37 -0800
Subject: [PATCH] --- yaml --- r: 11803 b: refs/heads/master c:
 9e4e23bccb127fac109e765dfb7f9372661cb415 h: refs/heads/master i:   11801:
 d342dfef31ead1832917506494b1e853e633f7e2   11799:
 fb2f6fe9af2d90eeed0d9ce723b7aeff3f8db5cf v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 807d9fd5467d..7c83c98e18fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 833d304b22edff5cc687ab7e5549c2f0dcdd951a
+refs/heads/master: 9e4e23bccb127fac109e765dfb7f9372661cb415
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index ba73797eb4cb..1de69cdc0e6c 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -630,10 +630,9 @@ static inline int de_thread(struct task_struct *tsk)
 	/*
 	 * Account for the thread group leader hanging around:
 	 */
-	count = 2;
-	if (thread_group_leader(current))
-		count = 1;
-	else {
+	count = 1;
+	if (!thread_group_leader(current)) {
+		count = 2;
 		/*
 		 * The SIGALRM timer survives the exec, but needs to point
 		 * at us as the new group leader now.  We have a race with