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.

(cherry picked from commit 7c9d2b79935d413389a603918a711df75acd3f48)
(cherry picked from commit ea248e53bf763c16fcc26bd1212f2d094db10e15)

Gbp-Pq: Name cgroup-Check-ancestor-memory-min-for-unified-memory-confi.patch

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 60a77993616ee05cc32069cc8d8b5a888c44b2be..4ff88fb4c100fafdc201e8775927041eec12c238 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -933,7 +933,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;
 }