From: Chris Down <chris@chrisdown.name>
Date: Mon, 30 Sep 2019 17:24:26 +0000 (+0100)
Subject: cgroup: Check ancestor memory min for unified memory config
X-Git-Tag: v244-rc1~248^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c9d2b79935d413389a603918a711df75acd3f48;p=thirdparty%2Fsystemd.git

cgroup: Check ancestor memory min for unified memory config

Otherwise we might not enable it when we should, ie. DefaultMemoryMin is
set in a parent, but not MemoryMin in the current unit.
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 423742969e5..bcf06b0e606 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -955,7 +955,7 @@ static bool unit_has_unified_memory_config(Unit *u) {
         c = unit_get_cgroup_context(u);
         assert(c);
 
-        return c->memory_min > 0 || unit_get_ancestor_memory_low(u) > 0 ||
+        return unit_get_ancestor_memory_min(u) > 0 || unit_get_ancestor_memory_low(u) > 0 ||
                c->memory_high != CGROUP_LIMIT_MAX || c->memory_max != CGROUP_LIMIT_MAX ||
                c->memory_swap_max != CGROUP_LIMIT_MAX;
 }