From: Anita Zhang <the.anitazha@gmail.com>
Date: Mon, 19 Oct 2020 09:17:07 +0000 (-0700)
Subject: oomd: simplify if/else error check
X-Git-Tag: v247-rc1~49^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=349a2003fd112c14eff016d73d40440f9d156501;p=thirdparty%2Fsystemd.git

oomd: simplify if/else error check
---

diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index 9eb8ab9f5a4..6b75fc326d4 100644
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -170,15 +170,12 @@ static int recursively_get_cgroup_context(Hashmap *new_h, const char *path) {
                 if (r < 0)
                         return (r == -ENOMEM) ? r : 0;
 
-                if (oom_group) {
+                if (oom_group)
                         r = oomd_insert_cgroup_context(NULL, new_h, cg_path);
-                        if (r == -ENOMEM)
-                                return r;
-                } else {
+                else
                         r = recursively_get_cgroup_context(new_h, cg_path);
-                        if (r == -ENOMEM)
-                                return r;
-                }
+                if (r == -ENOMEM)
+                        return r;
         } while ((r = cg_read_subgroup(d, &subpath)) > 0);
 
         return 0;