The branch stable/13 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=31ddfec5099b311ec53bf9986e972a5985f93196
commit 31ddfec5099b311ec53bf9986e972a5985f93196
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-09-20 09:30:54 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-09-27 00:24:08 +0000
aio_fsync_vnode: use for(;;) loop instead of label
(cherry picked from commit 922bee44e400321ac98b3b371cde3f0ff6137dd0)
---
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 7d4d9ac3e94b..d4683c91e80a 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);
}
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
