From bbce82dfabd79a5093f0912d0eb1f7a1af54b7be Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Fri, 9 Jan 2026 19:06:07 +0100 Subject: [PATCH] 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(). --- src/core/cgroup.c | 2 +- src/core/cgroup.h | 2 -- src/core/unit.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 8925772437..9a218ff058 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 6c45b72f11..5d450bd608 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 84b3132dd8..95e5285805 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; }