From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 11 Jul 2025 19:58:51 +0000 (+0200)
Subject: core/scope: drop effectively unused unit_watch_pidref() calls
X-Git-Tag: v258-rc1~73^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db4641a65a08173ae8044448e33a50bc517e05b;p=thirdparty%2Fsystemd.git

core/scope: drop effectively unused unit_watch_pidref() calls

Follow-up for 495e75ed5c8cce933947dae10a4a1b5f8067e432

The mentioned commit switched scope unit's "pids" deserialization
to call unit_watch_pid() already, meaning all later invocations
in scope_coldplug() are no-op. Remove the cruft altogether.
---

diff --git a/src/core/scope.c b/src/core/scope.c
index def2039e1a7..83b7d2d46fd 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -236,15 +236,6 @@ static int scope_coldplug(Unit *u) {
         if (r < 0)
                 return r;
 
-        if (!IN_SET(s->deserialized_state, SCOPE_DEAD, SCOPE_FAILED) && u->pids) {
-                PidRef *pid;
-                SET_FOREACH(pid, u->pids) {
-                        r = unit_watch_pidref(u, pid, /* exclusive= */ false);
-                        if (r < 0)
-                                return r;
-                }
-        }
-
         bus_scope_track_controller(s);
 
         scope_set_state(s, s->deserialized_state);