The patch titled
Subject: pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix
has been removed from the -mm tree. Its filename was
pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix
tweak a few things, might be wrong, also insufficient!
Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Louis Rilling <louis.rilling@xxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/exit.c | 5 +++--
kernel/pid_namespace.c | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN kernel/exit.c~pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix kernel/exit.c
--- a/kernel/exit.c~pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix
+++ a/kernel/exit.c
@@ -74,8 +74,9 @@ static void __unhash_process(struct task
list_del_init(&p->sibling);
__this_cpu_dec(process_counts);
- /* If we are the last child process in a pid namespace
- * to be reaped notify the child_reaper.
+ /*
+ * If we are the last child process in a pid namespace to be
+ * reaped, notify the child_reaper.
*/
parent = p->real_parent;
if ((task_active_pid_ns(p)->child_reaper == parent) &&
diff -puN kernel/pid_namespace.c~pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix kernel/pid_namespace.c
--- a/kernel/pid_namespace.c~pidns-guarantee-that-the-pidns-init-will-be-the-last-pidns-process-reaped-v2-fix
+++ a/kernel/pid_namespace.c
@@ -199,6 +199,7 @@ void zap_pid_ns_processes(struct pid_nam
read_lock(&tasklist_lock);
}
read_unlock(&tasklist_lock);
+ set_current_state(TASK_RUNNING);
if (pid_ns->reboot)
current->signal->group_exit_code = pid_ns->reboot;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix.patch
mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix.patch
mm-do_migrate_pages-rename-arguments.patch
mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix.patch
mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix.patch
mm-page_allocc-remove-pageblock_default_order.patch
mm-remove-sparsemem-allocation-details-from-the-bootmem-allocator-fix.patch
mm-page_allocc-cleanups.patch
mm-fix-slab-page-flags-corruption-fix.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
