From nobody Fri May 29 21:40:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gRxbw3B2Qz6g8LM for ; Fri, 29 May 2026 21:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRxbw29Bqz4BJJ for ; Fri, 29 May 2026 21:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780090828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lo1byTM9GNSPL7OAqFTUwlr04Moipvt1wRSBnF8GYNw=; b=UXQ/7YxL9ebzHEIKCHCRrCdqe2EWyXPT4rNR+qPmQWL+haGRPVR/xm7lbDO1o/6ZeLcckj dH+2OZvuWlI2owONjllJwfqulprfOZjMc0gT7lq41g3nTHSpCnJZduNVeBbKal9vlucwFQ gf7/jjO1NwUzjSsepv+pDH0Ki71qafpHmRiSBdWveCuZgwLsJ2HDWelRdtAw/PX2SRDwXk Xwe+5c9Ern9jmdG2OMHme844QZmrCkGs/Jt7WmtMmBNzWdOuUZuzEZexcnSES/7QYKW9Tx 1MwSL4zmoeftuiVJJ6VQpFcE8op/dZzz+RzWys0hmBiA3KRToUxhKoj1EflgEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780090828; a=rsa-sha256; cv=none; b=lEqd63x3hm7cUSGd3Z8U4RSv176+yXOydsUsUjZwXQUIOqQYKE1c/Luzn/3pDmoGp+44YZ bpqaE8AoVpkdyfEmolZAbbaoFMITDME3rWNdp8zaOSmxbKQvfFeZx2jDLJcrmPzpjAA1L6 EZ+oNhOwC6Qs1mmTPR87Sltsly205ogmq6tN6RjxoaZDrdjLZ+XEBDwZ5OF43NxLPqZsuY v40cESYQzS4wAowyIzQBVc8AQSMFyaXSbuzMvvJrzYvYmovwQbFaJLAzAUs19vEtXbQPns Skw3JK9DSOhyi/Bcm6GNgyusWtC3dVP7k8bgQCaWUR/xgekPnY2oier3e72v+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780090828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lo1byTM9GNSPL7OAqFTUwlr04Moipvt1wRSBnF8GYNw=; b=HxuYUSP+KoLK11Xv68olOzYg8Njotlo35C1uGTaP4NZ64QZP3dWBLze7mi66qMYGhcQBVy Sp7v6DUluLzqK86GT2Tk6/YGcTCPRaffayv7P1HZUaP9Fnxps/FLg8ZVDNn5sG+SfHIoVA ma/ZyFzINXJPA92fcgmP+OxeL4vdoCl1hWLK1oToLmzobYVfLILLLDsOKqa+uezILmihVB tYh64URsyocTk0Sku+XiNRjftCTmuAFkLJQaodu7xsWfhxzsV/lQJ/xgZ6n1bJ6xhn4kYF rU/8coV7hyb2t1GBJieiz1J1g2eWxeTnUKJdH+wJOg/whxT5ogwCLTemSNAJuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRxbw1jXCzr16 for ; Fri, 29 May 2026 21:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a9b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 21:40:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c5ad71c31160 - stable/14 - eventhandler: Fix the NODEBUG build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c5ad71c31160114752f5a4c1524349772105f6d0 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 21:40:28 +0000 Message-Id: <6a1a07cc.3a9b8.226c4d15@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c5ad71c31160114752f5a4c1524349772105f6d0 commit c5ad71c31160114752f5a4c1524349772105f6d0 Author: Mark Johnston AuthorDate: 2026-05-06 14:39:52 +0000 Commit: Mark Johnston CommitDate: 2026-05-29 21:40:22 +0000 eventhandler: Fix the NODEBUG build Reported by: Michael Butler 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 ccbb07b826b8..6e34f61475b4 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -289,10 +289,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);