---

yaml
---
r: 273239
b: refs/heads/master
c: 77ceab8
h: refs/heads/master
i:
  273237: a5a2f17
  273235: fa141bc
  273231: 1f7efca
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33ef6b6984403a688189317ef46bb3caab3b70e0
+refs/heads/master: 77ceab8ea590d7dc6c8f055ce43dfebd74428107

trunk/kernel/cgroup.c

@@ -2135,14 +2135,17 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 		oldcgrp = task_cgroup_from_root(tsk, root);
 		if (cgrp == oldcgrp)
 			continue;
-		/* attach each task to each subsystem */
-		for_each_subsys(root, ss) {
-			if (ss->attach_task)
-				ss->attach_task(cgrp, tsk);
-		}
 		/* if the thread is PF_EXITING, it can just get skipped. */
 		retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, true);
-		BUG_ON(retval != 0 && retval != -ESRCH);
+		if (retval == 0) {
+			/* attach each task to each subsystem */
+			for_each_subsys(root, ss) {
+				if (ss->attach_task)
+					ss->attach_task(cgrp, tsk);
+			}
+		} else {
+			BUG_ON(retval != -ESRCH);
+		}
 	}
 	/* nothing is sensitive to fork() after this point. */