From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Nov 2018 17:25:37 +0000 (+0100)
Subject: cgroup: units that aren't loaded properly should not result in cgroup controllers... 
X-Git-Tag: v240~225^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=442ce7759c668bf9857eff13a90b0cfa6be8d426;p=thirdparty%2Fsystemd.git

cgroup: units that aren't loaded properly should not result in cgroup controllers being pulled in

This shouldn't make much difference in real life, but is a bit cleaner.
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 1aab238866c..bc6df17c0be 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1270,7 +1270,11 @@ static CGroupMask unit_get_bpf_mask(Unit *u) {
 CGroupMask unit_get_own_mask(Unit *u) {
         CGroupContext *c;
 
-        /* Returns the mask of controllers the unit needs for itself */
+        /* Returns the mask of controllers the unit needs for itself. If a unit is not properly loaded, return an empty
+         * mask, as we shouldn't reflect it in the cgroup hierarchy then. */
+
+        if (u->load_state != UNIT_LOADED)
+                return 0;
 
         c = unit_get_cgroup_context(u);
         if (!c)