1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00

core/cgroup: fix embarrassing typo

https://github.com/docker/docker/issues/10280
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-01-31 23:03:25 -05:00
parent afa3509a4f
commit a3bd89ea99
Notes: Lennart Poettering 2015-02-12 17:44:44 +01:00
Backport: bugfix

View File

@ -380,7 +380,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
}
}
if ((mask & CGROUP_MEMORY) & !is_root) {
if ((mask & CGROUP_MEMORY) && !is_root) {
if (c->memory_limit != (uint64_t) -1) {
char buf[DECIMAL_STR_MAX(uint64_t) + 1];