From: Benjamin Berg <bberg@redhat.com>
Date: Mon, 7 Feb 2022 16:34:21 +0000 (+0100)
Subject: oom: Cleanup of information dump code after kill
X-Git-Tag: v251-rc1~339
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=100abbc650a075936aa2700a7b19790f7519fa23;p=thirdparty%2Fsystemd.git

oom: Cleanup of information dump code after kill

This is a follow up to 29f4185a9cdc ("oomd: Dump top offenders after a
kill action") to clean up the code a bit for review comments that
happened after the code had been merged already.
---

diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c
index 4d05f57a692..77718d9c9e3 100644
--- a/src/oom/oomd-util.c
+++ b/src/oom/oomd-util.c
@@ -227,7 +227,7 @@ static int dump_kill_candidates(OomdCGroupContext **sorted, int n, int dump_unti
 
         f = open_memstream_unlocked(&dump, &size);
         if (!f)
-                return -errno;;
+                return -errno;
 
         fprintf(f, "Considered %d cgroups for killing, top candidates were:\n", n);
         for (int i = 0; i < dump_until; i++)
@@ -237,8 +237,6 @@ static int dump_kill_candidates(OomdCGroupContext **sorted, int n, int dump_unti
         if (r < 0)
                 return r;
 
-        f = safe_fclose(f);
-
         return log_dump(LOG_INFO, dump);
 }