From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Nov 2018 11:41:14 +0000 (+0100)
Subject: mount: simplify de-serialization of control PID a bit
X-Git-Tag: v240~112^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f459cd96ea31c50dc84795a62fb7cf2ae285727;p=thirdparty%2Fsystemd.git

mount: simplify de-serialization of control PID a bit
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 9b81b6be207..f5aa90e3df9 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1210,12 +1210,10 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F
                         log_unit_debug(u, "Failed to parse n-retry-umount value: %s", value);
 
         } else if (streq(key, "control-pid")) {
-                pid_t pid;
 
-                if (parse_pid(value, &pid) < 0)
+                if (parse_pid(value, &m->control_pid) < 0)
                         log_unit_debug(u, "Failed to parse control-pid value: %s", value);
-                else
-                        m->control_pid = pid;
+
         } else if (streq(key, "control-command")) {
                 MountExecCommand id;