git: b1203ecc7bb5 - stable/13 - vfs: retire unused vn_seqc_write_begin_unheld*

[Mateusz Guzik]

The branch stable/13 has been updated by mjg:

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

commit b1203ecc7bb520b9ea2d4fac97439948317e4768
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-05-29 02:26:19 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-06-07 00:34:54 +0000

    vfs: retire unused vn_seqc_write_begin_unheld*
    
    (cherry picked from commit 3cf75ca220fb6a9006fa0481b97e154602f6f554)
---
 sys/kern/vfs_subr.c | 21 ++-------------------
 sys/sys/vnode.h     |  2 --
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 3e6d11624197..bd4413edcb40 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -6824,25 +6824,17 @@ vn_dir_check_exec(struct vnode *vp, struct componentname *cnp)
  * to prevent the vnode from getting freed.
  */
 void
-vn_seqc_write_begin_unheld_locked(struct vnode *vp)
+vn_seqc_write_begin_locked(struct vnode *vp)
 {
 
 	ASSERT_VI_LOCKED(vp, __func__);
+	VNPASS(vp->v_holdcnt > 0, vp);
 	VNPASS(vp->v_seqc_users >= 0, vp);
 	vp->v_seqc_users++;
 	if (vp->v_seqc_users == 1)
 		seqc_sleepable_write_begin(&vp->v_seqc);
 }
 
-void
-vn_seqc_write_begin_locked(struct vnode *vp)
-{
-
-	ASSERT_VI_LOCKED(vp, __func__);
-	VNPASS(vp->v_holdcnt > 0, vp);
-	vn_seqc_write_begin_unheld_locked(vp);
-}
-
 void
 vn_seqc_write_begin(struct vnode *vp)
 {
@@ -6852,15 +6844,6 @@ vn_seqc_write_begin(struct vnode *vp)
 	VI_UNLOCK(vp);
 }
 
-void
-vn_seqc_write_begin_unheld(struct vnode *vp)
-{
-
-	VI_LOCK(vp);
-	vn_seqc_write_begin_unheld_locked(vp);
-	VI_UNLOCK(vp);
-}
-
 void
 vn_seqc_write_end_locked(struct vnode *vp)
 {
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index d26c8aa70d8e..f492b3389d0e 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -785,8 +785,6 @@ int	vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio);
 int	vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, int xfersize,
 	    struct uio *uio);
 
-void	vn_seqc_write_begin_unheld_locked(struct vnode *vp);
-void	vn_seqc_write_begin_unheld(struct vnode *vp);
 void	vn_seqc_write_begin_locked(struct vnode *vp);
 void	vn_seqc_write_begin(struct vnode *vp);
 void	vn_seqc_write_end_locked(struct vnode *vp);