svn commit: r365273 - in head/sys: kern sys

[Mateusz Guzik]

Author: mjg
Date: Wed Sep  2 19:21:37 2020
New Revision: 365273
URL: https://svnweb.freebsd.org/changeset/base/365273

Log:
  vfs: retire vholdl as a symbol
  
  Similarly to vrefl in r364283.

Modified:
  head/sys/kern/vfs_subr.c
  head/sys/sys/vnode.h

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Wed Sep  2 19:21:10 2020	(r365272)
+++ head/sys/kern/vfs_subr.c	Wed Sep  2 19:21:37 2020	(r365273)
@@ -3227,15 +3227,6 @@ vhold(struct vnode *vp)
 }
 
 void
-vholdl(struct vnode *vp)
-{
-
-	ASSERT_VI_LOCKED(vp, __func__);
-	CTR2(KTR_VFS, "%s: vp %p", __func__, vp);
-	vhold(vp);
-}
-
-void
 vholdnz(struct vnode *vp)
 {
 

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Wed Sep  2 19:21:10 2020	(r365272)
+++ head/sys/sys/vnode.h	Wed Sep  2 19:21:37 2020	(r365273)
@@ -688,7 +688,6 @@ void	vget_finish_ref(struct vnode *vp, enum vgetstate 
 void	vget_abort(struct vnode *vp, enum vgetstate vs);
 void	vgone(struct vnode *vp);
 void	vhold(struct vnode *);
-void	vholdl(struct vnode *);
 void	vholdnz(struct vnode *);
 bool	vhold_smr(struct vnode *);
 void	vinactive(struct vnode *vp);
@@ -974,6 +973,11 @@ vrefcnt(struct vnode *vp)
 
 	return (vp->v_usecount);
 }
+
+#define	vholdl(vp)	do {						\
+	ASSERT_VI_LOCKED(vp, __func__);					\
+	vhold(vp);							\
+} while (0)
 
 #define	vrefl(vp)	do {						\
 	ASSERT_VI_LOCKED(vp, __func__);					\