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/dbus-cgroup.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/dbus-cgroup.c')
| -rw-r--r-- | src/core/dbus-cgroup.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index 1f2a396a6..9ebcad9da 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -133,7 +133,6 @@ const BusProperty bus_cgroup_context_properties[] = { { "BlockIOWriteBandwidth", bus_cgroup_append_device_bandwidths, "a(st)", 0 }, { "MemoryAccounting", bus_property_append_bool, "b", offsetof(CGroupContext, memory_accounting) }, { "MemoryLimit", bus_property_append_uint64, "t", offsetof(CGroupContext, memory_limit) }, - { "MemorySoftLimit", bus_property_append_uint64, "t", offsetof(CGroupContext, memory_soft_limit) }, { "DevicePolicy", bus_cgroup_append_device_policy, "s", offsetof(CGroupContext, device_policy) }, { "DeviceAllow", bus_cgroup_append_device_allow, "a(ss)", 0 }, {} @@ -418,21 +417,16 @@ int bus_cgroup_set_property( return 1; - } else if (streq(name, "MemoryLimit") || streq(name, "MemorySoftLimit")) { + } else if (streq(name, "MemoryLimit")) { if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_UINT64) return -EINVAL; if (mode != UNIT_CHECK) { uint64_t limit; - dbus_message_iter_get_basic(i, &limit); - if (streq(name, "MemoryLimit")) - c->memory_limit = limit; - else - c->memory_soft_limit = limit; - + c->memory_limit = limit; unit_write_drop_in_private_format(u, mode, name, "%s=%" PRIu64, name, limit); } |