chiark / gitweb /
core/cgroup: fix embarrassing typo
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 1 Feb 2015 04:03:25 +0000 (23:03 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 1 Feb 2015 04:03:56 +0000 (23:03 -0500)
https://github.com/docker/docker/issues/10280

src/core/cgroup.c

index 64d00b1..10fdcc9 100644 (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];