core: port unit_fork_helper_process() and unit_fork_and_watch_rm_rf() to PidRef

[thirdparty/systemd.git] / src / core / service.c

diff --git a/src/core/service.c b/src/core/service.c
index 0ecfe46cfdfb366b65acaaa507607b71a25386e7..05a2bb6ddf1a58ce6bc9620ae6acb0c49219e35e 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -4890,7 +4890,6 @@ static int service_clean(Unit *u, ExecCleanMask mask) {
         _cleanup_strv_free_ char **l = NULL;
         bool may_clean_fdstore = false;
         Service *s = SERVICE(u);
-        pid_t pid;
         int r;
 
         assert(s);
@@ -4931,11 +4930,7 @@ static int service_clean(Unit *u, ExecCleanMask mask) {
         if (r < 0)
                 goto fail;
 
-        r = unit_fork_and_watch_rm_rf(u, l, &pid);
-        if (r < 0)
-                goto fail;
-
-        r = pidref_set_pid(&s->control_pid, pid);
+        r = unit_fork_and_watch_rm_rf(u, l, &s->control_pid);
         if (r < 0)
                 goto fail;