treewide: use log_*_errno whenever %m is in the format string

[thirdparty/systemd.git] / src / core / cgroup.c

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 02c4e0a419ae27448629c4bcc7893770a8b7f654..382e6a6ccc6fd7d3408bd58743bb34191f181386 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -154,7 +154,7 @@ static int lookup_blkio_device(const char *p, dev_t *dev) {
 
         r = stat(p, &st);
         if (r < 0) {
-                log_warning("Couldn't stat device %s: %m", p);
+                log_warning_errno(errno, "Couldn't stat device %s: %m", p);
                 return -errno;
         }
 
@@ -219,7 +219,7 @@ static int whitelist_major(const char *path, const char *name, char type, const
 
         f = fopen("/proc/devices", "re");
         if (!f) {
-                log_warning("Cannot open /proc/devices to resolve %s (%c): %m", name, type);
+                log_warning_errno(errno, "Cannot open /proc/devices to resolve %s (%c): %m", name, type);
                 return -errno;
         }
 
@@ -280,7 +280,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;
 }
 
@@ -630,10 +630,8 @@ static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) {
 
         /* First, create our own group */
         r = cg_create_everywhere(u->manager->cgroup_supported, mask, u->cgroup_path);
-        if (r < 0) {
-                log_error_errno(r, "Failed to create cgroup %s: %m", u->cgroup_path);
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to create cgroup %s: %m", u->cgroup_path);
 
         /* Keep track that this is now realized */
         u->cgroup_realized = true;
@@ -857,10 +855,8 @@ int manager_setup_cgroup(Manager *m) {
         m->cgroup_root = NULL;
 
         r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &m->cgroup_root);
-        if (r < 0) {
-                log_error_errno(r, "Cannot determine cgroup we are running in: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Cannot determine cgroup we are running in: %m");
 
         /* LEGACY: Already in /system.slice? If so, let's cut this
          * off. This is to support live upgrades from older systemd
@@ -883,10 +879,8 @@ int manager_setup_cgroup(Manager *m) {
 
         /* 2. Show data */
         r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path);
-        if (r < 0) {
-                log_error_errno(r, "Cannot find cgroup mount point: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Cannot find cgroup mount point: %m");
 
         log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
         if (!m->test_run) {
@@ -904,17 +898,15 @@ int manager_setup_cgroup(Manager *m) {
 
                 /* 4. Make sure we are in the root cgroup */
                 r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to create root cgroup hierarchy: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to create root cgroup hierarchy: %m");
 
                 /* 5. And pin it, so that it cannot be unmounted */
                 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");
+                        log_error_errno(errno, "Failed to open pin file: %m");
                         return -errno;
                 }