core/cgroup: fix embarrassing typo

https://github.com/docker/docker/issues/10280
(cherry picked from commit a3bd89ea99)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-01-31 23:06:12 -05:00
parent 2b5a60aca8
commit a64a24640c
+1 -1
View File
@@ -382,7 +382,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];