From bdf52fd2249aa13d55b1c5bdb0b773400e1cee83 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 8 Feb 2008 04:19:11 -0800
Subject: [PATCH] --- yaml --- r: 84662 b: refs/heads/master c:
 430c623121ea88ca80595c99fdc63b7f8a803ae5 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/init/main.c  | 1 -
 trunk/kernel/sys.c | 9 ++++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 31f650737527..e22c73e01ce0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 297bd42b15daed02453ff59ce6d31216a58b0398
+refs/heads/master: 430c623121ea88ca80595c99fdc63b7f8a803ae5
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 9a5b18c0a63d..ed9747f00ec4 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -833,7 +833,6 @@ static int __init kernel_init(void * unused)
 	 */
 	init_pid_ns.child_reaper = current;
 
-	__set_special_pids(task_pid(current));
 	cad_pid = task_pid(current);
 
 	smp_prepare_cpus(setup_max_cpus);
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index c326d6dceee3..7de9c984f696 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1054,12 +1054,11 @@ asmlinkage long sys_setsid(void)
 	if (group_leader->signal->leader)
 		goto out;
 
-	/* Fail if a process group id already exists that equals the proposed
-	 * session id.
+	/* Fail if a process group id already exists that equals the
+	 * proposed session id.
 	 *
-	 * Don't check if session == 1 because kernel threads and CLONE_NEWPID
-	 * tasks use this session id and so the check will always fail and make
-	 * it so init cannot successfully call setsid.
+	 * Don't check if session == 1, clone(CLONE_NEWPID) creates
+	 * this group/session beforehand.
 	 */
 	if (session != 1 && pid_task(sid, PIDTYPE_PGID))
 		goto out;