Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-5.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"I made a mistake while removing cgroup task list lazy init
optimization making the root cgroup.procs show entries for the
init_tasks. The zero entries doesn't cause critical failures but does
make systemd print out warning messages during boot.
Fix it by omitting init_tasks as they should be"
* 'for-5.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: init_tasks shouldn't be linked to the root cgroup
+8
-5
+8
-5
kernel/cgroup/cgroup.c
+8
-5
kernel/cgroup/cgroup.c
···
5927
5927
5928
5928
spin_lock_irq(&css_set_lock);
5929
5929
5930
-
WARN_ON_ONCE(!list_empty(&child->cg_list));
5931
-
cset = task_css_set(current); /* current is @child's parent */
5932
-
get_css_set(cset);
5933
-
cset->nr_tasks++;
5934
-
css_set_move_task(child, NULL, cset, false);
5930
+
/* init tasks are special, only link regular threads */
5931
+
if (likely(child->pid)) {
5932
+
WARN_ON_ONCE(!list_empty(&child->cg_list));
5933
+
cset = task_css_set(current); /* current is @child's parent */
5934
+
get_css_set(cset);
5935
+
cset->nr_tasks++;
5936
+
css_set_move_task(child, NULL, cset, false);
5937
+
}
5935
5938
5936
5939
/*
5937
5940
* If the cgroup has to be frozen, the new task has too. Let's set