From: Susant Sahani <ssahani@vmware.com>
Date: Mon, 18 Jan 2021 20:38:46 +0000 (+0100)
Subject: remount-fs: Use hashmap_ensure_put
X-Git-Tag: v248-rc1~306^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5bcd738959790259fa349d1d835638cd7bd72e0;p=thirdparty%2Fsystemd.git

remount-fs: Use hashmap_ensure_put
---

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 19f5bd0d119..9668a49dc46 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -31,17 +31,15 @@ static int track_pid(Hashmap **h, const char *path, pid_t pid) {
         assert(path);
         assert(pid_is_valid(pid));
 
-        r = hashmap_ensure_allocated(h, NULL);
-        if (r < 0)
-                return log_oom();
-
         c = strdup(path);
         if (!c)
                 return log_oom();
 
-        r = hashmap_put(*h, PID_TO_PTR(pid), c);
-        if (r < 0)
+        r = hashmap_ensure_put(h, NULL, PID_TO_PTR(pid), c);
+        if (r == -ENOMEM)
                 return log_oom();
+        if (r < 0)
+                return log_error_errno(r, "Failed to store pid " PID_FMT, pid);
 
         TAKE_PTR(c);
         return 0;