aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/cgroup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 8075b72d22be..1bf4f7a12703 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2038,7 +2038,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk,
2038 2038
2039 /* @tsk either already exited or can't exit until the end */ 2039 /* @tsk either already exited or can't exit until the end */
2040 if (tsk->flags & PF_EXITING) 2040 if (tsk->flags & PF_EXITING)
2041 continue; 2041 goto next;
2042 2042
2043 /* as per above, nr_threads may decrease, but not increase. */ 2043 /* as per above, nr_threads may decrease, but not increase. */
2044 BUG_ON(i >= group_size); 2044 BUG_ON(i >= group_size);
@@ -2046,7 +2046,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk,
2046 ent.cgrp = task_cgroup_from_root(tsk, root); 2046 ent.cgrp = task_cgroup_from_root(tsk, root);
2047 /* nothing to do if this task is already in the cgroup */ 2047 /* nothing to do if this task is already in the cgroup */
2048 if (ent.cgrp == cgrp) 2048 if (ent.cgrp == cgrp)
2049 continue; 2049 goto next;
2050 /* 2050 /*
2051 * saying GFP_ATOMIC has no effect here because we did prealloc 2051 * saying GFP_ATOMIC has no effect here because we did prealloc
2052 * earlier, but it's good form to communicate our expectations. 2052 * earlier, but it's good form to communicate our expectations.
@@ -2054,7 +2054,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk,
2054 retval = flex_array_put(group, i, &ent, GFP_ATOMIC); 2054 retval = flex_array_put(group, i, &ent, GFP_ATOMIC);
2055 BUG_ON(retval != 0); 2055 BUG_ON(retval != 0);
2056 i++; 2056 i++;
2057 2057 next:
2058 if (!threadgroup) 2058 if (!threadgroup)
2059 break; 2059 break;
2060 } while_each_thread(leader, tsk); 2060 } while_each_thread(leader, tsk);