X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fcgroup.c;h=6d8de051382b0687ab1a449c245ebb2f05cd38f0;hb=e34ba212225a27cdf5f974be22cc539ae7ee7ca5;hp=62f1a5231fe958d2496e99831d015bdf2a8948a5;hpb=8bab8dded67d026c39367bbd5e27d2f6c556c38e;p=linux-2.6

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 62f1a5231f..6d8de05138 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1722,7 +1722,12 @@ void cgroup_enable_task_cg_lists(void)
 	use_task_css_set_links = 1;
 	do_each_thread(g, p) {
 		task_lock(p);
-		if (list_empty(&p->cg_list))
+		/*
+		 * We should check if the process is exiting, otherwise
+		 * it will race with cgroup_exit() in that the list
+		 * entry won't be deleted though the process has exited.
+		 */
+		if (!(p->flags & PF_EXITING) && list_empty(&p->cg_list))
 			list_add(&p->cg_list, &p->cgroups->tasks);
 		task_unlock(p);
 	} while_each_thread(g, p);
@@ -2569,6 +2574,7 @@ static int proc_cgroup_show(struct seq_file *m, void *v)
 		/* Skip this hierarchy if it has no active subsystems */
 		if (!root->actual_subsys_bits)
 			continue;
+		seq_printf(m, "%lu:", root->subsys_bits);
 		for_each_subsys(root, ss)
 			seq_printf(m, "%s%s", count++ ? "," : "", ss->name);
 		seq_putc(m, ':');