From 098560201cc4ab7cce25f5c820d2ff6618f7c9dc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Nov 2017 19:16:03 +0100 Subject: [PATCH] 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 --- src/core/cgroup.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 0cd1d06b6..33779110d 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -1109,9 +1109,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 */ } } @@ -1129,7 +1127,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) { -- 2.30.2