[systemd-commits] stable Branch 'v216-stable' - src/core

[Zbigniew Jędrzejewski-Szmek]

 src/core/cgroup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a64a24640cb66aef9468a50be6577490dfa2a83a
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Jan 31 23:03:25 2015 -0500

    core/cgroup: fix embarrassing typo
    
    https://github.com/docker/docker/issues/10280
    (cherry picked from commit a3bd89ea99214db7ca2ad6ae59181d5119a54f09)

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 37db3d5..7edb802 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -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];