Fix possible lack of status messages on shutdown/reboot

[elogind.git] / src / core / dbus-cgroup.c

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 1f2a396a6da488a59acefe5d23ed8c9bd9de2c60..f198357637579a5fc9820e352d01afd80555f1a0 100644 (file)
--- 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                                           },
         {}
@@ -239,7 +238,6 @@ int bus_cgroup_set_property(
                         DBusMessageIter sub2;
                         const char *path;
                         uint64_t u64;
-                        CGroupBlockIODeviceBandwidth *a;
 
                         dbus_message_iter_recurse(&sub, &sub2);
                         if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &path, true) < 0 ||
@@ -247,6 +245,7 @@ int bus_cgroup_set_property(
                                 return -EINVAL;
 
                         if (mode != UNIT_CHECK) {
+                                CGroupBlockIODeviceBandwidth *a = NULL;
                                 CGroupBlockIODeviceBandwidth *b;
                                 bool exist = false;
 
@@ -274,8 +273,7 @@ int bus_cgroup_set_property(
                                 a->bandwidth = u64;
 
                                 if (!exist)
-                                        LIST_PREPEND(CGroupBlockIODeviceBandwidth, device_bandwidths,
-                                                     c->blockio_device_bandwidths, a);
+                                        LIST_PREPEND(device_bandwidths, c->blockio_device_bandwidths, a);
                         }
 
                         n++;
@@ -331,7 +329,6 @@ int bus_cgroup_set_property(
                         const char *path;
                         uint64_t u64;
                         unsigned long ul;
-                        CGroupBlockIODeviceWeight *a;
 
                         dbus_message_iter_recurse(&sub, &sub2);
 
@@ -344,6 +341,7 @@ int bus_cgroup_set_property(
                                 return -EINVAL;
 
                         if (mode != UNIT_CHECK) {
+                                CGroupBlockIODeviceWeight *a = NULL;
                                 CGroupBlockIODeviceWeight *b;
                                 bool exist = false;
 
@@ -370,8 +368,7 @@ int bus_cgroup_set_property(
                                 a->weight = ul;
 
                                 if (!exist)
-                                        LIST_PREPEND(CGroupBlockIODeviceWeight, device_weights,
-                                                     c->blockio_device_weights, a);
+                                        LIST_PREPEND(device_weights,c->blockio_device_weights, a);
                         }
 
                         n++;
@@ -418,21 +415,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);
                 }
 
@@ -473,7 +465,6 @@ int bus_cgroup_set_property(
                 while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
                         DBusMessageIter sub2;
                         const char *path, *rwm;
-                        CGroupDeviceAllow *a;
 
                         dbus_message_iter_recurse(&sub, &sub2);
 
@@ -495,6 +486,7 @@ int bus_cgroup_set_property(
                         }
 
                         if (mode != UNIT_CHECK) {
+                                CGroupDeviceAllow *a = NULL;
                                 CGroupDeviceAllow *b;
                                 bool exist = false;
 
@@ -523,7 +515,7 @@ int bus_cgroup_set_property(
                                 a->m = !!strchr(rwm, 'm');
 
                                 if (!exist)
-                                        LIST_PREPEND(CGroupDeviceAllow, device_allow, c->device_allow, a);
+                                        LIST_PREPEND(device_allow, c->device_allow, a);
                         }
 
                         n++;