cgroup: always enable memory.use_hierarchy= for all cgroups in the memory hierarchy

The non-hierarchial mode contradicts the whole idea of a cgroup tree so
let's not support this. In the future the kernel will only support the
hierarchial logic anyway.
This commit is contained in:
Lennart Poettering 2013-09-23 16:02:31 -05:00
parent a0f708053b
commit e58cec11e6
Notes: Lennart Poettering 2013-10-04 17:11:46 +02:00
Backport: bugfix

View file

@ -254,8 +254,9 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
}
if (mask & CGROUP_MEMORY) {
char buf[DECIMAL_STR_MAX(uint64_t) + 1];
if (c->memory_limit != (uint64_t) -1) {
char buf[DECIMAL_STR_MAX(uint64_t) + 1];
sprintf(buf, "%" PRIu64 "\n", c->memory_limit);
r = cg_set_attribute("memory", path, "memory.limit_in_bytes", buf);
} else
@ -666,6 +667,9 @@ int manager_setup_cgroup(Manager *m) {
/* 6. Figure out which controllers are supported */
m->cgroup_supported = cg_mask_supported();
/* 7. Always enable hierarchial support if it exists... */
cg_set_attribute("memory", "/", "memory.use_hierarchy", "1");
return 0;
}