picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cgroups: always propagate controller membership to siblings, for all controllers

Browse source 
This is the behaviour the kernel cgroup rework exposes for all
controllers, hence let's do this already now for all cases.
This commit is contained in:
Lennart Poettering 2014-05-22 07:50:03 +09:00
parent db785129c9
commit 637f421e5c
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/cgroup.c
View file

@ -541,18 +541,12 @@ CGroupControllerMask unit_get_members_mask(Unit *u) {
}
CGroupControllerMask unit_get_siblings_mask(Unit *u) {
CGroupControllerMask m;
assert(u);
if (UNIT_ISSET(u->slice))
m = unit_get_members_mask(UNIT_DEREF(u->slice));
else
m = unit_get_cgroup_mask(u) | unit_get_members_mask(u);
return unit_get_members_mask(UNIT_DEREF(u->slice));
/* Sibling propagation is only relevant for weight-based
* controllers, so let's mask out everything else */
return m & (CGROUP_CPU|CGROUP_BLKIO|CGROUP_CPUACCT);
return unit_get_cgroup_mask(u) | unit_get_members_mask(u);
}
CGroupControllerMask unit_get_target_mask(Unit *u) {