summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-10-15 22:04:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 11:21:47 -0700
commit07edbde508869be63c38c5f2504bd8e8279cc535 (patch)
tree696b78b5eae2716f07261f6c037ec770332e10f4 /fs
parentf221e726bf4e082a05dcd573379ac859bfba7126 (diff)
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 <oleg@tv-sign.ru> Acked-by: Serge Hallyn <serue@us.ibm.com> Acked-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c2
1 files changed, 0 insertions, 2 deletions
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.