From: Oleg Nesterov Date: Thu, 16 Oct 2008 05:04:25 +0000 (-0700) Subject: pid_ns: de_thread: kill the now unneeded ->child_reaper change X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=07edbde508869be63c38c5f2504bd8e8279cc535;p=openwrt%2Fstaging%2Fblogic.git pid_ns: de_thread: kill the now unneeded ->child_reaper change de_thread() checks if the old leader was the ->child_reaper, this is not possible any longer. With the previous patch ->group_leader itself will change ->child_reaper on exit. Henceforth find_new_reaper() is the only function (apart from initialization) which plays with ->child_reaper. Signed-off-by: Oleg Nesterov Acked-by: Serge Hallyn Acked-by: Pavel Emelyanov Acked-by: Sukadev Bhattiprolu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/exec.c b/fs/exec.c index 4a790f2e224e..cfb5656b2cdc 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -825,8 +825,6 @@ static int de_thread(struct task_struct *tsk) schedule(); } - if (unlikely(task_child_reaper(tsk) == leader)) - task_active_pid_ns(tsk)->child_reaper = tsk; /* * The only record we have of the real-time age of a * process, regardless of execs it's done, is start_time.