cgroup: Handle error when destroying cgroup

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

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index c24bfc8d33f34f848f36e6aca2ed4bc5fddb53ac..af048354e1fa71d23fde70783150183bf45c69f3 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -153,10 +153,8 @@ static int lookup_blkio_device(const char *p, dev_t *dev) {
         assert(dev);
 
         r = stat(p, &st);
-        if (r < 0) {
-                log_warning("Couldn't stat device %s: %m", p);
-                return -errno;
-        }
+        if (r < 0)
+                return log_warning_errno(errno, "Couldn't stat device %s: %m", p);
 
         if (S_ISBLK(st.st_mode))
                 *dev = st.st_rdev;
@@ -218,10 +216,8 @@ static int whitelist_major(const char *path, const char *name, char type, const
         assert(type == 'b' || type == 'c');
 
         f = fopen("/proc/devices", "re");
-        if (!f) {
-                log_warning("Cannot open /proc/devices to resolve %s (%c): %m", name, type);
-                return -errno;
-        }
+        if (!f)
+                return log_warning_errno(errno, "Cannot open /proc/devices to resolve %s (%c): %m", name, type);
 
         FOREACH_LINE(line, f, goto fail) {
                 char buf[2+DECIMAL_STR_MAX(unsigned)+3+4], *p, *w;
@@ -280,7 +276,7 @@ static int whitelist_major(const char *path, const char *name, char type, const
         return 0;
 
 fail:
-        log_warning("Failed to read /proc/devices: %m");
+        log_warning_errno(errno, "Failed to read /proc/devices: %m");
         return -errno;
 }
 
@@ -795,8 +791,10 @@ void unit_destroy_cgroup(Unit *u) {
                 return;
 
         r = cg_trim_everywhere(u->manager->cgroup_supported, u->cgroup_path, !unit_has_name(u, SPECIAL_ROOT_SLICE));
-        if (r < 0)
+        if (r < 0) {
                 log_debug_errno(r, "Failed to destroy cgroup %s: %m", u->cgroup_path);
+                return;
+        }
 
         hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
 
@@ -905,10 +903,8 @@ int manager_setup_cgroup(Manager *m) {
                 safe_close(m->pin_cgroupfs_fd);
 
                 m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK);
-                if (m->pin_cgroupfs_fd < 0) {
-                        log_error("Failed to open pin file: %m");
-                        return -errno;
-                }
+                if (m->pin_cgroupfs_fd < 0)
+                        return log_error_errno(errno, "Failed to open pin file: %m");
 
                 /* 6.  Always enable hierarchial support if it exists... */
                 cg_set_attribute("memory", "/", "memory.use_hierarchy", "1");