From nobody Mon May 25 15:58:22 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 4gPLC26ZmTz6fRYF for ; Mon, 25 May 2026 15:58:22 +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 4gPLC25vNFz3tc4 for ; Mon, 25 May 2026 15:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779724702; 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=oXib9n99ooEYVzhPbtSG4HedBEwpRkUGu2DouwE2dO0=; b=FfXai557gKSYZ237IO5NECfvdjP3Jbd6vy72kuG7hajpRPzCenWRXngbidaTFNcmG4c48b KJNR1XXjZ7G8fP0pZWJaxmPitmdALwI2HRU7dzgMl4KOP9+6XFl/IQK+vgsPHTgoJ4A5ns cXKFurUJFMfDAiqFRDgfcg+VjldfkFbhKzjkCUuUsh8JIrmJ/cNVynWuX4cEF0L7upn8K7 FJEi9PDQ/g+yGU50PxaR+b7YRYoN7gRkrSOGS3x3D8GP9+NHgSdSDcASxoZSd8dYx1tYQ4 s3LnoPyhYlkJjAtvkQVxCjJHTtbQn8b134haj0REPWD/qSlwJ9jeF+GPeFojVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779724702; a=rsa-sha256; cv=none; b=o0icUBavibW0xSY6Lhyi1f6lPtO8VDlLNfvyUuPdF6rYuIKRq1O2OK7xV6z4y9FbWt5sZt 2koSuy3eJQCdU4KWSD3G4r0S1GMzFH/zqm7FDLDDeyNNBE+XdDnVF1Chio+jIu5yNjkPei tU0GHTj1UYiv0YI9dRHW4XpIwcw78Ltu6PRDIHwdn5+qZeoRQaifyeI7dHItKpLzEc9k9q 3BhilDaiAKm6ZYdypfSlWwrvBO9foMSPDWGT5xgpn26+l2ofQgVZwn3kqXj9vjS1bfKGvX zbzlWjq7nrZR287BYFkL49ZoZMlhg9AHpjmD3Gt2ZtJ9wS9QMQ3/hQXJemZdkA== 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=1779724702; 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=oXib9n99ooEYVzhPbtSG4HedBEwpRkUGu2DouwE2dO0=; b=IgStMWQe/W9dabiyMDQ366e1rEYn2vkJ/6Htd/1ksFB8nrpC421xUThs5J9ElDnr69k1P8 cDf7VAAFrAB3oODq5+dFVlGcpMkBXm4lbGYyFHAUbwm04o4qsKCF4tgT5XefTw9Gbk8kky qzNmMW6OXfHcWVARSr5cG/jh64wDeziKXfytt4zb9bJOkvkXmfVBf98Iqvd+KjMqRNJTIZ +rjUN4/1GE+HZmo/xIhZmU/paExGe0Kf4qD8iS7wf/OoWRYGW/y/27dFIqQ7ND7+MkLS5H q/tosyVEODTcltuWvXS6jBIJZmTXaT3Nfw7UOWrj7nKV1K3T9xtuDaHIzpzIUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPLC25Ds4zpNS for ; Mon, 25 May 2026 15:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26efa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 25 May 2026 15:58:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 151f0971eaa7 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 151f0971eaa70db86e22e8c201f05ae3f4d3bd58 Auto-Submitted: auto-generated Date: Mon, 25 May 2026 15:58:22 +0000 Message-Id: <6a14719e.26efa.7bebe228@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=151f0971eaa70db86e22e8c201f05ae3f4d3bd58 commit 151f0971eaa70db86e22e8c201f05ae3f4d3bd58 Author: Mark Johnston AuthorDate: 2026-05-06 14:39:52 +0000 Commit: Mark Johnston CommitDate: 2026-05-25 15:58:17 +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 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);