Date: Mon, 25 May 2026 15:58:22 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 151f0971eaa7 - stable/15 - eventhandler: Fix the NODEBUG build Message-ID: <6a14719e.26efa.7bebe228@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=151f0971eaa70db86e22e8c201f05ae3f4d3bd58 commit 151f0971eaa70db86e22e8c201f05ae3f4d3bd58 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-05-06 14:39:52 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-05-25 15:58:17 +0000 eventhandler: Fix the NODEBUG build Reported by: Michael Butler <imb@protected-networks.net> Fixes: 735b16d490ae ("eventhandler: Fix a race when pruning eventhandlers") (cherry picked from commit 3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2) --- sys/kern/subr_eventhandler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index e91647648995..ccc62253d81e 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -288,10 +288,12 @@ void eventhandler_prune_list(struct eventhandler_list *list) { struct eventhandler_entry *ep, *en; - int pruned = 0; + int pruned __diagused; CTR2(KTR_EVH, "%s: pruning list \"%s\"", __func__, list->el_name); EHL_LOCK_ASSERT(list, MA_OWNED); + + pruned = 0; TAILQ_FOREACH_SAFE(ep, &list->el_entries, ee_link, en) { if (ep->ee_priority == EHE_DEAD_PRIORITY) { TAILQ_REMOVE(&list->el_entries, ep, ee_link);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a14719e.26efa.7bebe228>