chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afa3509
)
core/cgroup: fix embarrassing typo
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 1 Feb 2015 04:03:25 +0000
(23:03 -0500)
committer
Zbigniew 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
patch
|
blob
|
history
diff --git
a/src/core/cgroup.c
b/src/core/cgroup.c
index 64d00b16b6bb75394a261511433f1be858aca032..10fdcc9984e39f4a5171c77d68c750d7b7d3d490 100644
(file)
--- 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];