The patch titled pid_ns: de_thread: kill the now unneeded ->child_reaper change has been added to the -mm tree. Its filename is pid_ns-de_thread-kill-the-now-unneeded-child_reaper-change.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pid_ns: de_thread: kill the now unneeded ->child_reaper change From: Oleg Nesterov <oleg@xxxxxxxxxx> 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@xxxxxxxxxx> Acked-by: Serge Hallyn <serue@xxxxxxxxxx> Acked-by: Pavel Emelyanov <xemul@xxxxxxxxxx> Acked-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/exec.c | 2 -- 1 file changed, 2 deletions(-) diff -puN fs/exec.c~pid_ns-de_thread-kill-the-now-unneeded-child_reaper-change fs/exec.c --- a/fs/exec.c~pid_ns-de_thread-kill-the-now-unneeded-child_reaper-change +++ a/fs/exec.c @@ -822,8 +822,6 @@ static int de_thread(struct task_struct 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. _ Patches currently in -mm which might be from oleg@xxxxxxxxxx are exit-signals-use-of-uninitialized-field-notify_count.patch pid_ns-zap_pid_ns_processes-fix-the-child_reaper-changing.patch pid_ns-bug-11391-change-child_reaper-when-init-group_leader-exits.patch linux-next.patch posix-timers-dont-switch-to-group_leader-if-it_process-dies.patch posix-timers-always-do-get_task_structtimer-it_process.patch posix-timers-sys_timer_create-remove-the-buggy-pf_exiting-check.patch posix-timers-sys_timer_create-simplify-and-s-tasklist-rcu.patch posix-timers-move-the-initialization-of-timer-sigq-from-send-to-create-path.patch posix-timers-sys_timer_create-cleanup-the-error-handling.patch posix-timers-kill-it_sigev_signo-and-it_sigev_value.patch posix-timers-lock_timer-kill-the-bogus-it_id-check.patch posix-timers-lock_timer-make-it-readable.patch posix-timers-use-struct-pid-instead-of-struct-task_struct.patch posix-timers-check-it_signal-instead-of-it_pid-to-validate-the-timer.patch posix-timers-simplify-de_thread-exit_itimers-path.patch make-ptrace_untrace-static.patch coredump-format_corename-dont-append-%pid-if-multi-threaded.patch kthread_bind-use-wait_task_inactivetask_uninterruptible.patch pid_ns-de_thread-kill-the-now-unneeded-child_reaper-change.patch pid_ns-kill-the-now-unused-task_child_reaper.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html