From owner-dev-commits-src-all@freebsd.org Sat May 22 18:24:00 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3FBCE6340B0; Sat, 22 May 2021 18:24:00 +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 4FnX1C6NXXz4Txj; Sat, 22 May 2021 18:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 93016EB9; Sat, 22 May 2021 18:23:59 +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 14MINxEg005923; Sat, 22 May 2021 18:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14MINxf0005922; Sat, 22 May 2021 18:23:59 GMT (envelope-from git) Date: Sat, 22 May 2021 18:23:59 GMT Message-Id: <202105221823.14MINxf0005922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: df6533f9b40a - stable/13 - vfs: change vn_freevnodes_* prefix to idiomatic vfs_freevnodes_* 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/stable/13 X-Git-Reftype: branch X-Git-Commit: df6533f9b40ab5480aec3990561f4f50c94351d1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2021 18:24:00 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=df6533f9b40ab5480aec3990561f4f50c94351d1 commit df6533f9b40ab5480aec3990561f4f50c94351d1 Author: Mateusz Guzik AuthorDate: 2021-05-14 19:01:56 +0000 Commit: Mateusz Guzik CommitDate: 2021-05-22 18:22:25 +0000 vfs: change vn_freevnodes_* prefix to idiomatic vfs_freevnodes_* (cherry picked from commit 715fcc0d342684da5d109a7e4891d30aa38667c9) --- sys/kern/vfs_subr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 98c97324e467..53c9c12be34c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1364,7 +1364,7 @@ static int vnlruproc_sig; #define VNLRU_FREEVNODES_SLOP 128 static __inline void -vn_freevnodes_inc(void) +vfs_freevnodes_inc(void) { struct vdbatch *vd; @@ -1375,7 +1375,7 @@ vn_freevnodes_inc(void) } static __inline void -vn_freevnodes_dec(void) +vfs_freevnodes_dec(void) { struct vdbatch *vd; @@ -3308,7 +3308,7 @@ vhold(struct vnode *vp) VNASSERT(old >= 0 && (old & VHOLD_ALL_FLAGS) == 0, vp, ("%s: wrong hold count %d", __func__, old)); if (old == 0) - vn_freevnodes_dec(); + vfs_freevnodes_dec(); } void @@ -3361,7 +3361,7 @@ vhold_smr(struct vnode *vp) VNASSERT(count >= 0, vp, ("invalid hold count %d\n", count)); if (atomic_fcmpset_int(&vp->v_holdcnt, &count, count + 1)) { if (count == 0) - vn_freevnodes_dec(); + vfs_freevnodes_dec(); return (true); } } @@ -3402,7 +3402,7 @@ vhold_recycle_free(struct vnode *vp) return (false); } if (atomic_fcmpset_int(&vp->v_holdcnt, &count, count + 1)) { - vn_freevnodes_dec(); + vfs_freevnodes_dec(); return (true); } } @@ -3563,7 +3563,7 @@ vdropl_final(struct vnode *vp) * we never got this far, they will vdrop later. */ if (__predict_false(!atomic_cmpset_int(&vp->v_holdcnt, 0, VHOLD_NO_SMR))) { - vn_freevnodes_inc(); + vfs_freevnodes_inc(); VI_UNLOCK(vp); /* * We lost the aforementioned race. Any subsequent access is @@ -3600,7 +3600,7 @@ vdropl(struct vnode *vp) return; } if (!VN_IS_DOOMED(vp)) { - vn_freevnodes_inc(); + vfs_freevnodes_inc(); vdrop_deactivate(vp); /* * Also unlocks the interlock. We can't assert on it as we