From: Geass-LL <shenxiaogll@163.com>
Date: Fri, 2 Apr 2021 03:27:59 +0000 (+0800)
Subject: unit: coldplug both job and nop_job if possible
X-Git-Tag: v250-rc1~825
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dbd330c7ef28852db0fb044503ed6f072477d50;p=thirdparty%2Fsystemd.git

unit: coldplug both job and nop_job if possible

Sometimes, both job and nop_job are deserialized. In this case,
if we only cold plug the job, the nop_job will also stuck in the
job list.
---

diff --git a/src/core/unit.c b/src/core/unit.c
index 7c39e4d0f8c..2f7f022ef35 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3588,7 +3588,6 @@ int unit_add_blockdev_dependency(Unit *u, const char *what, UnitDependencyMask m
 int unit_coldplug(Unit *u) {
         int r = 0, q;
         char **i;
-        Job *uj;
 
         assert(u);
 
@@ -3611,9 +3610,13 @@ int unit_coldplug(Unit *u) {
                         r = q;
         }
 
-        uj = u->job ?: u->nop_job;
-        if (uj) {
-                q = job_coldplug(uj);
+        if (u->job) {
+                q = job_coldplug(u->job);
+                if (q < 0 && r >= 0)
+                        r = q;
+        }
+        if (u->nop_job) {
+                q = job_coldplug(u->nop_job);
                 if (q < 0 && r >= 0)
                         r = q;
         }