diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 3e6d1162419..bd4413edcb4 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6823,24 +6823,16 @@ vn_dir_check_exec(struct vnode *vp, struct componentname *cnp) * Do not use this variant unless you have means other than the hold count * to prevent the vnode from getting freed. */ -void -vn_seqc_write_begin_unheld_locked(struct vnode *vp) -{ - - ASSERT_VI_LOCKED(vp, __func__); - 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); + 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 @@ -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 d26c8aa70d8..f492b3389d0 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);