From 49c990010f48b429b52f73f54d70d529f0d2c7fe Mon Sep 17 00:00:00 2001 From: Chris Down Date: Mon, 30 Sep 2019 18:24:26 +0100 Subject: [PATCH] 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) Related: #1763435 --- src/core/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index d40f9cbc2a..4299923754 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -851,7 +851,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; }