From nobody Fri Oct 3 19:22:19 2025 X-Original-To: dev-commits-src-main@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 4cddpN0J5hz690Bj; Fri, 03 Oct 2025 19:22:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cddpM5N14z3hk7; Fri, 03 Oct 2025 19:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759519339; 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=ucRNutcU0Kx62EcJVOfxdVeSTalPzl7gDdhGv7hhhZg=; b=hYoWPU73qX+Tf58osEffa8jZm2Ous3bxD6KzU86hA0kbRe8/jOKMsuJbDetjkfM9iQOiee B0tAnqxcrp6LvEdU4/kyFPuRUFrPAsiJsunfgmSmgG+AyDmtvrqYV5GGt+HJ06eFjbhixb sbFUHvIPc2BZl4FTmNn59ENJXYFbnMNRdceXpQQa4vHz6/rpXEw46QLLTR0HzoY4MoJpvS fw4LXrLfdsiyFSxE9LHGviBAL44ndDCC6UBHwBb28eGQgLHVaJTs2u2xEKWS2cBpvVlU19 9Foifn4ZTpT/HzgxxL41IO7i3hBv7sZVg7SE6fU33rdtM/HWhucFU3FycroFiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759519339; 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=ucRNutcU0Kx62EcJVOfxdVeSTalPzl7gDdhGv7hhhZg=; b=yiHI63DtnRRBqhPWhsBhriGeJB9LTCgKxHEeojr6l+QDZ3EH+6pPTNaOoKkDsBHKWql8xj F6A3RAe42/GjrQVxtEk/pijq+7ekqqFDL0zaGWgYJEs1gDMMaR9H3A5/y3WrCoPpeX80S1 396NoQ8WmBeb/Fs8bTdtY96t7+dwbzpLUTs0d1NdUsldYCSowH45F+2vrjzvsIdJ3DoSrR EDavDmXqdsTqt9M/UTPrQ5JbG1QNgE5LACcp7LqLAtXjHQFoUSR3SuABPGMD1t4GFKoEHM nWMkb9unaB6fl/kdI8RHmfM6qq3tNN/4yAGh2NhEmKL/ZeqZmgKS/WKUyo9Fbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759519339; a=rsa-sha256; cv=none; b=ZmMDPtfsBf5XbylWZYJxaSmEVLM/6QfA4REaRbp32h5QqOoZveU0a5aYDfzfrZK7SgO0sX +BVVYYztZhNOVAo2QkDCbQeFAfw+rKENO5eis51qb/dA8vmf+kw96QisUa9r1tnJdzeWYY 9NCHbWWptF7Z7r0GgVazj2rsKzUVEVUWr90qp8mA06USr9KhJTGK4hxVqZYvVkBY/whCZ4 Tn9mdT3+iErMe1PfH1w5ld+S047/ZEZwiGU16sFLTLcB243lueCI6J5kUcWOA4oblOLjwO eFqZd9mLaYskIQan5dDWpCaEIvV2PGipwFKC4LHJC3vvNk5dSLv2YdYUoUQizg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cddpM4lQZz17Xk; Fri, 03 Oct 2025 19:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 593JMJkh047337; Fri, 3 Oct 2025 19:22:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593JMJwa047334; Fri, 3 Oct 2025 19:22:19 GMT (envelope-from git) Date: Fri, 3 Oct 2025 19:22:19 GMT Message-Id: <202510031922.593JMJwa047334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 72347d73464c - main - nullfs: assert the vnode is not doomed in null_hashget_locked List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72347d73464ccdd361c4d286486b9b4ea8d7c945 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=72347d73464ccdd361c4d286486b9b4ea8d7c945 commit 72347d73464ccdd361c4d286486b9b4ea8d7c945 Author: Mateusz Guzik AuthorDate: 2025-10-01 10:28:48 +0000 Commit: Mateusz Guzik CommitDate: 2025-10-03 19:15:34 +0000 nullfs: assert the vnode is not doomed in null_hashget_locked While here some style touch ups and fixing a stale name in an assert. Reviewed by: kib Tested by: pho (previous version) Differential Revision: https://reviews.freebsd.org/D38761 --- sys/fs/nullfs/null_subr.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 053614b6910d..4db0bc475791 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -96,7 +96,7 @@ null_hashget_locked(struct mount *mp, struct vnode *lowervp) struct null_node *a; struct vnode *vp; - ASSERT_VOP_LOCKED(lowervp, "null_hashget"); + ASSERT_VOP_LOCKED(lowervp, __func__); rw_assert(&null_hash_lock, RA_LOCKED); /* @@ -107,17 +107,20 @@ null_hashget_locked(struct mount *mp, struct vnode *lowervp) */ hd = NULL_NHASH(lowervp); LIST_FOREACH(a, hd, null_hash) { - if (a->null_lowervp == lowervp && NULLTOV(a)->v_mount == mp) { - /* - * Since we have the lower node locked the nullfs - * node can not be in the process of recycling. If - * it had been recycled before we grabed the lower - * lock it would not have been found on the hash. - */ - vp = NULLTOV(a); - vref(vp); - return (vp); - } + if (a->null_lowervp != lowervp) + continue; + /* + * Since we have the lower node locked the nullfs + * node can not be in the process of recycling. If + * it had been recycled before we grabed the lower + * lock it would not have been found on the hash. + */ + vp = NULLTOV(a); + VNPASS(!VN_IS_DOOMED(vp), vp); + if (vp->v_mount != mp) + continue; + vref(vp); + return (vp); } return (NULL); }