diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-31 23:03:25 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-31 23:06:12 -0500 |
| commit | a64a24640cb66aef9468a50be6577490dfa2a83a (patch) | |
| tree | 2a88e22f8b21c72254b03fca0e061a114395e0cb | |
| parent | 2b5a60aca874ab526d33912391ea491c267d246f (diff) | |
| download | systemd-v216-stable.tar.gz | |
core/cgroup: fix embarrassing typov216-stable
https://github.com/docker/docker/issues/10280
(cherry picked from commit a3bd89ea99214db7ca2ad6ae59181d5119a54f09)
| -rw-r--r-- | src/core/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 37db3d5289..7edb802f3f 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]; |