From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 1 Feb 2015 04:03:25 +0000 (-0500)
Subject: core/cgroup: fix embarrassing typo
X-Git-Tag: v219~215
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a3bd89ea99214db7ca2ad6ae59181d5119a54f09;p=elogind.git

core/cgroup: fix embarrassing typo

https://github.com/docker/docker/issues/10280
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 64d00b16b..10fdcc998 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -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];