The branch main has been updated by mjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3cf75ca220fb6a9006fa0481b97e154602f6f554
commit 3cf75ca220fb6a9006fa0481b97e154602f6f554
Author: Mateusz Guzik <m...@freebsd.org>
AuthorDate: 2021-05-29 02:26:19 +0000
Commit: Mateusz Guzik <m...@freebsd.org>
CommitDate: 2021-05-29 22:04:09 +0000
vfs: retire unused vn_seqc_write_begin_unheld*
---
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 6a3cf2aa7505..7c9604457aef 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -6861,25 +6861,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)
{
@@ -6889,15 +6881,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 a61ef2611b0a..ed5867b80754 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -788,8 +788,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);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
