From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 9 Jan 2026 18:06:07 +0000 (+0100)
Subject: core/unit: drop unneeded unit_modify_nft_set() call during coldplug
X-Git-Tag: v260-rc1~367^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbce82dfabd79a5093f0912d0eb1f7a1af54b7be;p=thirdparty%2Fsystemd.git

core/unit: drop unneeded unit_modify_nft_set() call during coldplug

We re-realize all unit cgroups upon daemon-reload, and
cgroup_context_apply() would take care of NFT set refreshing.
No need to duplicate that in unit_coldplug().
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 89257724379..9a218ff0586 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1325,7 +1325,7 @@ static void cgroup_apply_firewall(Unit *u) {
         (void) bpf_firewall_install(u);
 }
 
-void unit_modify_nft_set(Unit *u, bool add) {
+static void unit_modify_nft_set(Unit *u, bool add) {
         int r;
 
         assert(u);
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 6c45b72f117..5d450bd6085 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -379,8 +379,6 @@ int cgroup_context_add_device_allow(CGroupContext *c, const char *dev, CGroupDev
 int cgroup_context_add_or_update_device_allow(CGroupContext *c, const char *dev, CGroupDevicePermissions p);
 int cgroup_context_add_bpf_foreign_program(CGroupContext *c, uint32_t attach_type, const char *path);
 
-void unit_modify_nft_set(Unit *u, bool add);
-
 CGroupMask unit_get_own_mask(Unit *u);
 CGroupMask unit_get_delegate_mask(Unit *u);
 CGroupMask unit_get_members_mask(Unit *u);
diff --git a/src/core/unit.c b/src/core/unit.c
index 84b3132dd84..95e52858059 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3801,7 +3801,6 @@ int unit_coldplug(Unit *u) {
         if (u->nop_job)
                 RET_GATHER(r, job_coldplug(u->nop_job));
 
-        unit_modify_nft_set(u, /* add= */ true);
         return r;
 }