iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-5.2-fixes' into for-5.3

Browse Source
This commit is contained in:
Tejun Heo 2019-06-10 09:12:39 -07:00
commit 11dc8b4011
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/cgroup/cgroup.c
View File

@ -4401,7 +4401,7 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it)
it->task_pos = NULL; it->task_pos = NULL;
return; return;
} }
} while (!css_set_populated(cset) && !list_empty(&cset->dying_tasks)); } while (!css_set_populated(cset) && list_empty(&cset->dying_tasks));
if (!list_empty(&cset->tasks)) if (!list_empty(&cset->tasks))
it->task_pos = cset->tasks.next; it->task_pos = cset->tasks.next;
@ -4550,6 +4550,10 @@ struct task_struct *css_task_iter_next(struct css_task_iter *it)
spin_lock_irq(&css_set_lock); spin_lock_irq(&css_set_lock);
/* @it may be half-advanced by skips, finish advancing */
if (it->flags & CSS_TASK_ITER_SKIPPED)
css_task_iter_advance(it);
if (it->task_pos) { if (it->task_pos) {
it->cur_task = list_entry(it->task_pos, struct task_struct, it->cur_task = list_entry(it->task_pos, struct task_struct,
cg_list); cg_list);