From 349a2003fd112c14eff016d73d40440f9d156501 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Mon, 19 Oct 2020 02:17:07 -0700 Subject: [PATCH] oomd: simplify if/else error check --- src/oom/oomd-manager.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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; -- 2.47.3