git: df6533f9b40a - stable/13 - vfs: change vn_freevnodes_* prefix to idiomatic vfs_freevnodes_*

Mateusz Guzik mjg at FreeBSD.org
Sat May 22 18:24:00 UTC 2021


The branch stable/13 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=df6533f9b40ab5480aec3990561f4f50c94351d1

commit df6533f9b40ab5480aec3990561f4f50c94351d1
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-05-14 19:01:56 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
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


More information about the dev-commits-src-all mailing list