From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 8 Nov 2017 18:16:03 +0000 (+0100)
Subject: cgroup: make use of unit_get_subtree_mask() where appropriate
X-Git-Tag: v236~226^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=316049701787b6964163acdc56ad3c7035224825;p=thirdparty%2Fsystemd.git

cgroup: make use of unit_get_subtree_mask() where appropriate

subtree_mask is own_mask | members_mask, let's make use of that to
shorten a few things
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index dff7d1dddc1..b717837c721 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1107,9 +1107,7 @@ CGroupMask unit_get_members_mask(Unit *u) {
                         if (UNIT_DEREF(member->slice) != u)
                                 continue;
 
-                        u->cgroup_members_mask |=
-                                unit_get_own_mask(member) |
-                                unit_get_members_mask(member);
+                        u->cgroup_members_mask |= unit_get_subtree_mask(member); /* note that this calls ourselves again, for the children */
                 }
         }
 
@@ -1127,7 +1125,7 @@ CGroupMask unit_get_siblings_mask(Unit *u) {
         if (UNIT_ISSET(u->slice))
                 return unit_get_members_mask(UNIT_DEREF(u->slice));
 
-        return unit_get_own_mask(u) | unit_get_members_mask(u);
+        return unit_get_subtree_mask(u);
 }
 
 CGroupMask unit_get_subtree_mask(Unit *u) {