The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=922bee44e400321ac98b3b371cde3f0ff6137dd0
commit 922bee44e400321ac98b3b371cde3f0ff6137dd0 Author: Konstantin Belousov <[email protected]> AuthorDate: 2021-09-20 09:30:54 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2021-09-20 18:39:46 +0000 aio_fsync_vnode: use for(;;) loop instead of label Reviewed by: jhb, tmunro Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32023 --- sys/kern/vfs_aio.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 2da1a81d41bc..66792ccc1b92 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -724,24 +724,29 @@ static int aio_fsync_vnode(struct thread *td, struct vnode *vp, int op) { struct mount *mp; + vm_object_t obj; int error; - if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) - goto drop; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - if (vp->v_object != NULL) { - VM_OBJECT_WLOCK(vp->v_object); - vm_object_page_clean(vp->v_object, 0, 0, 0); - VM_OBJECT_WUNLOCK(vp->v_object); - } - if (op == LIO_DSYNC) - error = VOP_FDATASYNC(vp, td); - else - error = VOP_FSYNC(vp, MNT_WAIT, td); + for (;;) { + error = vn_start_write(vp, &mp, V_WAIT | PCATCH); + if (error != 0) + break; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + obj = vp->v_object; + if (obj != NULL) { + VM_OBJECT_WLOCK(obj); + vm_object_page_clean(obj, 0, 0, 0); + VM_OBJECT_WUNLOCK(obj); + } + if (op == LIO_DSYNC) + error = VOP_FDATASYNC(vp, td); + else + error = VOP_FSYNC(vp, MNT_WAIT, td); - VOP_UNLOCK(vp); - vn_finished_write(mp); -drop: + VOP_UNLOCK(vp); + vn_finished_write(mp); + break; + } return (error); } _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
