Commit 175aed3f authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

exit: reparent: document the ->has_child_subreaper checks

Swap the "init_task" and same_thread_group() checks.  This way it is more
simple to document these checks and we can remove the link to the previous
discussion on lkml.
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Aaron Tomlin <atomlin@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Kay Sievers <kay@vrfy.org>
Cc: Lennart Poettering <lennart@poettering.net>
Cc: Sterling Alexander <stalexan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3750ef97
...@@ -495,18 +495,16 @@ static struct task_struct *find_new_reaper(struct task_struct *father) ...@@ -495,18 +495,16 @@ static struct task_struct *find_new_reaper(struct task_struct *father)
if (father->signal->has_child_subreaper) { if (father->signal->has_child_subreaper) {
struct task_struct *reaper; struct task_struct *reaper;
/* /*
* Find the first ancestor marked as child_subreaper. * Find the first ->is_child_subreaper ancestor in our pid_ns.
* Note that the code below checks same_thread_group(reaper, * We start from father to ensure we can not look into another
* pid_ns->child_reaper). This is what we need to DTRT in a * namespace, this is safe because all its threads are dead.
* PID namespace. However we still need the check above, see
* http://marc.info/?l=linux-kernel&m=131385460420380
*/ */
for (reaper = father; for (reaper = father;
reaper != &init_task; !same_thread_group(reaper, pid_ns->child_reaper);
reaper = reaper->real_parent) { reaper = reaper->real_parent) {
if (same_thread_group(reaper, pid_ns->child_reaper)) /* call_usermodehelper() descendants need this check */
if (reaper == &init_task)
break; break;
if (!reaper->signal->is_child_subreaper) if (!reaper->signal->is_child_subreaper)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment