From: Lennart Poettering Date: Tue, 5 Sep 2017 09:17:01 +0000 (+0200) Subject: cgroup: always invalidate "cpu" and "cpuacct" together X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=99811701c83de137820dd65f3e5ff4c1d2f486e2;p=elogind.git cgroup: always invalidate "cpu" and "cpuacct" together This doesn't really matter, as we never invalidate cpuacct explicitly, and there's no real reason to care for it explicitly, however it's prettier if we always treat cpu and cpuacct as belonging together, the same way we conisder "io" and "blkio" to belong together. --- diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 01041d817..48f09658b 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -2225,6 +2225,9 @@ void unit_invalidate_cgroup(Unit *u, CGroupMask m) { if (m & (CGROUP_MASK_IO | CGROUP_MASK_BLKIO)) m |= CGROUP_MASK_IO | CGROUP_MASK_BLKIO; + if (m & (CGROUP_MASK_CPU | CGROUP_MASK_CPUACCT)) + m |= CGROUP_MASK_CPU | CGROUP_MASK_CPUACCT; + if ((u->cgroup_realized_mask & m) == 0) return;