From nobody Sat Mar 25 13:42:32 2023 X-Original-To: dev-commits-src-all@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 4PkKyJ4nKcz41C78; Sat, 25 Mar 2023 13:42:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkKyJ4GCnz3vXn; Sat, 25 Mar 2023 13:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679751752; 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=MvTGMMY0ZDEyLMayzk3g0qULXFiUtlOV40AX+Iq2N5A=; b=JNKumN/KzNvLxS7j+tgUKDWQbPfjegoGLBfofy2RT1S0WbGO3eSUjyRbUMb4R2+c5l6Hho Z+bQZPLrf89so1VOsJ9Dp0WxRlfS1FMei5pHkk5O+2RIqDFTRVglLdrXUpBoPgjHd+jcfq XPZzaeEhsDEXqXBS25DIPuw+IBMtVKC59z3xJUQ4KDf9crcACkyVQekWrRsUUJiR9Wi4+F QDguVXJLFe/Uv4zHHwT/TugBfWFiiYS0Kpf2eQo4fjqPcHBw6HqBPeIPsGR8M7JGLPOomf Lu99yRBv6d8pr6Gtm/w26mADs7DD7kC87QcznFWRR2Fv2UmFITGWu7M8564pvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679751752; 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=MvTGMMY0ZDEyLMayzk3g0qULXFiUtlOV40AX+Iq2N5A=; b=IIe9MguB1h6Ld+LB08zgAF90VgroL6Mhio8Z2OFEQBuZWmC0W/yannc5mV37Epqpj8Psf/ tFeCtculXB3zjCTSTem22pDJ5g4aoFzSmAqbXHRHExNmjTKJv4DvH79WAlBPYvRUBNhDXi Pxa6oa2GT4gi/waxys3nrhFgWYE95XT/9Y6QGac6grnnXCmiVGa2YRN6EJUMYdhX2/MXWB /lDTrUKaT8XX0nLMNBMExbZ7frc4OZjekTzw/6hTOorPhKSAHNLdNfiRvm9b/8qTvd1exU ALjfgJHwFb3f4LCicN4jwG5WjFZ6ftia8bcIYETZ5zUxsAHRFLW77KWVOSljkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679751752; a=rsa-sha256; cv=none; b=PADdx/K/qj4qDh7MVCeLLFWMXf6snPiJ1zEHrP7xOoeaHyL5pijDxuKoVNMecEsAmvYdDO aWCJ6D9DvaXcI/yi61EWeP8SA0E4FGOUkyqb8mCfDa1CPJ9YEFAaBlfS7R97xpOtGltEhF BejkAhtEGYk/DRZKDq1cQ/YNOht46yhGROZTCZnt9bToC3mJPNYDhhiKvFdZWpn4CEhVYy 3B5kPxd9csTVTWqjvejTNOFUBuizv9ebTTLDDkdN89axGs1K19S5ceJhAbntjSA8eAuigd 8KqMk58S7bk08T+HeVrd+MjCKyd2CR2wLG2LnDvgH/j3B3JpPuMlzwDS/glmQA== 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 4PkKyJ3JsCz121F; Sat, 25 Mar 2023 13:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PDgWuq048535; Sat, 25 Mar 2023 13:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PDgWaR048534; Sat, 25 Mar 2023 13:42:32 GMT (envelope-from git) Date: Sat, 25 Mar 2023 13:42:32 GMT Message-Id: <202303251342.32PDgWaR048534@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: e5eb1d298f65 - main - vfs: replace some spelled out VNASSERTs with VNPASS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e5eb1d298f65af257618503f61947d00666c8401 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e5eb1d298f65af257618503f61947d00666c8401 commit e5eb1d298f65af257618503f61947d00666c8401 Author: Mateusz Guzik AuthorDate: 2023-03-25 13:20:02 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-25 13:42:27 +0000 vfs: replace some spelled out VNASSERTs with VNPASS nfc --- sys/kern/vfs_subr.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index d89e0ed13dd5..f8a871906e0f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1650,8 +1650,7 @@ vtryrecycle(struct vnode *vp) struct mount *vnmp; CTR2(KTR_VFS, "%s: vp %p", __func__, vp); - VNASSERT(vp->v_holdcnt, vp, - ("vtryrecycle: Recycling vp %p without a reference.", vp)); + VNPASS(vp->v_holdcnt > 0, vp); /* * This vnode may found and locked via some other list, if so we * can't recycle it yet. @@ -3194,14 +3193,13 @@ vdefer_inactive(struct vnode *vp) { ASSERT_VI_LOCKED(vp, __func__); - VNASSERT(vp->v_holdcnt > 0, vp, - ("%s: vnode without hold count", __func__)); + VNPASS(vp->v_holdcnt > 0, vp); if (VN_IS_DOOMED(vp)) { vdropl(vp); return; } if (vp->v_iflag & VI_DEFINACT) { - VNASSERT(vp->v_holdcnt > 1, vp, ("lost hold count")); + VNPASS(vp->v_holdcnt > 1, vp); vdropl(vp); return; } @@ -3545,8 +3543,7 @@ vdbatch_enqueue(struct vnode *vp) struct vdbatch *vd; ASSERT_VI_LOCKED(vp, __func__); - VNASSERT(!VN_IS_DOOMED(vp), vp, - ("%s: deferring requeue of a doomed vnode", __func__)); + VNPASS(!VN_IS_DOOMED(vp), vp); if (vp->v_dbatchcpu != NOCPU) { VI_UNLOCK(vp); @@ -3584,8 +3581,7 @@ vdbatch_dequeue(struct vnode *vp) int i; short cpu; - VNASSERT(vp->v_type == VBAD || vp->v_type == VNON, vp, - ("%s: called for a used vnode\n", __func__)); + VNPASS(vp->v_type == VBAD || vp->v_type == VNON, vp); cpu = vp->v_dbatchcpu; if (cpu == NOCPU) @@ -3737,8 +3733,7 @@ vinactivef(struct vnode *vp) ASSERT_VOP_ELOCKED(vp, "vinactive"); ASSERT_VI_LOCKED(vp, "vinactive"); - VNASSERT((vp->v_iflag & VI_DOINGINACT) == 0, vp, - ("vinactive: recursed on VI_DOINGINACT")); + VNPASS((vp->v_iflag & VI_DOINGINACT) == 0, vp); CTR2(KTR_VFS, "%s: vp %p", __func__, vp); vp->v_iflag |= VI_DOINGINACT; vp->v_iflag &= ~VI_OWEINACT; @@ -3761,8 +3756,7 @@ vinactivef(struct vnode *vp) } error = VOP_INACTIVE(vp); VI_LOCK(vp); - VNASSERT(vp->v_iflag & VI_DOINGINACT, vp, - ("vinactive: lost VI_DOINGINACT")); + VNPASS(vp->v_iflag & VI_DOINGINACT, vp); vp->v_iflag &= ~VI_DOINGINACT; return (error); } @@ -4766,7 +4760,7 @@ vfs_deferred_inactive(struct vnode *vp, int lkflags) { ASSERT_VI_LOCKED(vp, __func__); - VNASSERT((vp->v_iflag & VI_DEFINACT) == 0, vp, ("VI_DEFINACT still set")); + VNPASS((vp->v_iflag & VI_DEFINACT) == 0, vp); if ((vp->v_iflag & VI_OWEINACT) == 0) { vdropl(vp); return; @@ -6376,7 +6370,7 @@ vfs_emptydir(struct vnode *vp) eof = 0; ASSERT_VOP_LOCKED(vp, "vfs_emptydir"); - VNASSERT(vp->v_type == VDIR, vp, ("vp is not a directory")); + VNPASS(vp->v_type == VDIR, vp); dirent = malloc(sizeof(struct dirent), M_TEMP, M_WAITOK); iov.iov_base = dirent;