]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cgroup: correct mangling of return values
authorLennart Poettering <lennart@poettering.net>
Mon, 10 Dec 2018 15:08:33 +0000 (16:08 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 10 Dec 2018 15:09:41 +0000 (16:09 +0100)
Let's nor return the unmangled return value before we actually mangle
it.

Fixes: #11062
src/core/cgroup.c

index 75085607d4663270364636adfe50562000b81ab0..55900479767b53483ec1f62075e14f74dc71b3b9 100644 (file)
@@ -2856,10 +2856,10 @@ static int unit_get_cpu_usage_raw(Unit *u, nsec_t *ret) {
                 uint64_t us;
 
                 r = cg_get_keyed_attribute("cpu", u->cgroup_path, "cpu.stat", STRV_MAKE("usage_usec"), &val);
-                if (r < 0)
-                        return r;
                 if (IN_SET(r, -ENOENT, -ENXIO))
                         return -ENODATA;
+                if (r < 0)
+                        return r;
 
                 r = safe_atou64(val, &us);
                 if (r < 0)