diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-09-17 14:58:00 -0500 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-09-17 14:58:00 -0500 |
commit | ddca82aca08712a302cfabdbe59f73ee9ed3f73a (patch) | |
tree | 9e2b487840cf91cb27386ac932616386a4d1f101 /src/core/load-fragment.c | |
parent | 387abf80ad40e4a6c2f4725c8eff4d66bf110d1f (diff) |
cgroup: get rid of MemorySoftLimit=
The cgroup attribute memory.soft_limit_in_bytes is unlikely to stay
around in the kernel for good, so let's not expose it for now. We can
readd something like it later when the kernel guys decided on a final
API for this.
Diffstat (limited to 'src/core/load-fragment.c')
-rw-r--r-- | src/core/load-fragment.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index cfc6f078a6..74454abe49 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2036,14 +2036,11 @@ int config_parse_memory_limit( void *userdata) { CGroupContext *c = data; - uint64_t *limit; off_t bytes; int r; - limit = streq(lvalue, "MemoryLimit") ? &c->memory_limit : &c->memory_soft_limit; - if (isempty(rvalue)) { - *limit = (uint64_t) -1; + c->memory_limit = (uint64_t) -1; return 0; } @@ -2056,7 +2053,7 @@ int config_parse_memory_limit( return 0; } - *limit = (uint64_t) bytes; + c->memory_limit = (uint64_t) bytes; return 0; } |