Messages in this thread Patch in this message | | | From | (Eric W. Biederman) | Date | Sun, 20 Jun 2010 01:44:13 -0700 | Subject | [PATCH 1/6] pid: Remove the child_reaper special case in init/main.c |
| |
It turns out that the existing assignment in copy_process of the child_reaper can handle the initial assignment of child_reaper we just need to generalize the test in kernel/fork.c
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- init/main.c | 9 --------- kernel/fork.c | 2 +- 2 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/init/main.c b/init/main.c index 3bdb152..38f7edc 100644 --- a/init/main.c +++ b/init/main.c @@ -865,15 +865,6 @@ static int __init kernel_init(void * unused) * init can run on any cpu. */ set_cpus_allowed_ptr(current, cpu_all_mask); - /* - * Tell the world that we're going to be the grim - * reaper of innocent orphaned children. - * - * We don't want people to have to make incorrect - * assumptions about where in the task array this - * can be found. - */ - init_pid_ns.child_reaper = current; cad_pid = task_pid(current); diff --git a/kernel/fork.c b/kernel/fork.c index b6cce14..8b85b17 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1263,7 +1263,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, tracehook_finish_clone(p, clone_flags, trace); if (thread_group_leader(p)) { - if (clone_flags & CLONE_NEWPID) + if (pid->numbers[pid->level].nr == 1) p->nsproxy->pid_ns->child_reaper = p; p->signal->leader_pid = pid; -- 1.6.5.2.143.g8cc62
| |