From 976c9657575bc2fd0e24aa22debee524a943c386 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 8 Dec 2006 02:38:02 -0800
Subject: [PATCH] --- yaml --- r: 43639 b: refs/heads/master c:
 f020bc468fe4a91d32046d448511978c7b611315 h: refs/heads/master i:   43637:
 78ea9296c87d54a0918900ed3bbab620b8748f77   43635:
 6640a6c197da3d9f37f3cf418fa1f5cbdc1b4a57   43631:
 a8cb7f5136676b19768c8991b83852db190b0495 v: v3

---
 [refs]             |  2 +-
 trunk/kernel/sys.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 158c5b7ae6ed..66d0e021bc76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84d737866e2babdeab0c6b18ea155c6a649663b8
+refs/heads/master: f020bc468fe4a91d32046d448511978c7b611315
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 4f9d23a3095f..c7675c1bfdf2 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1397,16 +1397,13 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
 		goto out;
 
 	if (pgid != pid) {
-		struct task_struct *p;
+		struct task_struct *g =
+			find_task_by_pid_type(PIDTYPE_PGID, pgid);
 
-		do_each_task_pid(pgid, PIDTYPE_PGID, p) {
-			if (process_session(p) == process_session(group_leader))
-				goto ok_pgid;
-		} while_each_task_pid(pgid, PIDTYPE_PGID, p);
-		goto out;
+		if (!g || process_session(g) != process_session(group_leader))
+			goto out;
 	}
 
-ok_pgid:
 	err = security_task_setpgid(p, pgid);
 	if (err)
 		goto out;