summaryrefslogtreecommitdiff
path: root/kernel/cgroup/cgroup-v1.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2018-01-19 08:51:16 -0800
committerTejun Heo <tj@kernel.org>2018-01-19 08:51:16 -0800
commit2c4736d9898a16b67bb31c03de166b3abaa5311a (patch)
tree66dcd62685bf276208e3fe1afee22f33e86cebbd /kernel/cgroup/cgroup-v1.c
parentc4e0842bf141178fd5bc0cfe364609ec782fb384 (diff)
parent4f58424da3deead2605e39a9df65f5f06107a3cb (diff)
Merge branch 'for-4.15-fixes' into for-4.16
Diffstat (limited to 'kernel/cgroup/cgroup-v1.c')
-rw-r--r--kernel/cgroup/cgroup-v1.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index 024085daab1ae..a2c05d2476ac5 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -123,7 +123,11 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from)
*/
do {
css_task_iter_start(&from->self, 0, &it);
- task = css_task_iter_next(&it);
+
+ do {
+ task = css_task_iter_next(&it);
+ } while (task && (task->flags & PF_EXITING));
+
if (task)
get_task_struct(task);
css_task_iter_end(&it);