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:03:56 -0500 |
| commit | a3bd89ea99214db7ca2ad6ae59181d5119a54f09 (patch) | |
| tree | 895a3bc1767c5564d892f223aab1559fc45a5fbe | |
| parent | afa3509a4f4438a869725dae1d6a6f20dc0182f3 (diff) | |
core/cgroup: fix embarrassing typo
https://github.com/docker/docker/issues/10280
| -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 64d00b16b6..10fdcc9984 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]; |