svn commit: r346288 - in stable/12/sys: fs/fuse fs/msdosfs kern sys
Konstantin Belousov
kib at FreeBSD.org
Tue Sep 3 14:06:58 UTC 2019
Author: kib
Date: Tue Apr 16 17:55:54 2019
New Revision: 346288
URL: https://svnweb.freebsd.org/changeset/base/346288
Log:
MFC r346065:
Add vn_fsync_buf().
Modified:
stable/12/sys/fs/fuse/fuse_io.c
stable/12/sys/fs/msdosfs/msdosfs_fat.c
stable/12/sys/kern/vfs_default.c
stable/12/sys/kern/vfs_vnops.c
stable/12/sys/sys/vnode.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/fs/fuse/fuse_io.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_io.c Tue Apr 16 17:54:51 2019 (r346287)
+++ stable/12/sys/fs/fuse/fuse_io.c Tue Apr 16 17:55:54 2019 (r346288)
@@ -744,13 +744,8 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp)
int
fuse_io_flushbuf(struct vnode *vp, int waitfor, struct thread *td)
{
- struct vop_fsync_args a = {
- .a_vp = vp,
- .a_waitfor = waitfor,
- .a_td = td,
- };
- return (vop_stdfsync(&a));
+ return (vn_fsync_buf(vp, waitfor));
}
/*
Modified: stable/12/sys/fs/msdosfs/msdosfs_fat.c
==============================================================================
--- stable/12/sys/fs/msdosfs/msdosfs_fat.c Tue Apr 16 17:54:51 2019 (r346287)
+++ stable/12/sys/fs/msdosfs/msdosfs_fat.c Tue Apr 16 17:55:54 2019 (r346288)
@@ -980,7 +980,6 @@ extendfile(struct denode *dep, u_long count, struct bu
u_long cn, got;
struct msdosfsmount *pmp = dep->de_pmp;
struct buf *bp;
- struct vop_fsync_args fsync_ap;
daddr_t blkno;
/*
@@ -1092,12 +1091,8 @@ extendfile(struct denode *dep, u_long count, struct bu
bdwrite(bp);
}
if (vm_page_count_severe() ||
- buf_dirty_count_severe()) {
- fsync_ap.a_vp = DETOV(dep);
- fsync_ap.a_waitfor = MNT_WAIT;
- fsync_ap.a_td = curthread;
- vop_stdfsync(&fsync_ap);
- }
+ buf_dirty_count_severe())
+ vn_fsync_buf(DETOV(dep), MNT_WAIT);
}
}
}
Modified: stable/12/sys/kern/vfs_default.c
==============================================================================
--- stable/12/sys/kern/vfs_default.c Tue Apr 16 17:54:51 2019 (r346287)
+++ stable/12/sys/kern/vfs_default.c Tue Apr 16 17:55:54 2019 (r346288)
@@ -638,98 +638,8 @@ vop_stdfsync(ap)
struct thread *a_td;
} */ *ap;
{
- struct vnode *vp;
- struct buf *bp, *nbp;
- struct bufobj *bo;
- struct mount *mp;
- int error, maxretry;
- error = 0;
- maxretry = 10000; /* large, arbitrarily chosen */
- vp = ap->a_vp;
- mp = NULL;
- if (vp->v_type == VCHR) {
- VI_LOCK(vp);
- mp = vp->v_rdev->si_mountpt;
- VI_UNLOCK(vp);
- }
- bo = &vp->v_bufobj;
- BO_LOCK(bo);
-loop1:
- /*
- * MARK/SCAN initialization to avoid infinite loops.
- */
- TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) {
- bp->b_vflags &= ~BV_SCANNED;
- bp->b_error = 0;
- }
-
- /*
- * Flush all dirty buffers associated with a vnode.
- */
-loop2:
- TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) {
- if ((bp->b_vflags & BV_SCANNED) != 0)
- continue;
- bp->b_vflags |= BV_SCANNED;
- if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) {
- if (ap->a_waitfor != MNT_WAIT)
- continue;
- if (BUF_LOCK(bp,
- LK_EXCLUSIVE | LK_INTERLOCK | LK_SLEEPFAIL,
- BO_LOCKPTR(bo)) != 0) {
- BO_LOCK(bo);
- goto loop1;
- }
- BO_LOCK(bo);
- }
- BO_UNLOCK(bo);
- KASSERT(bp->b_bufobj == bo,
- ("bp %p wrong b_bufobj %p should be %p",
- bp, bp->b_bufobj, bo));
- if ((bp->b_flags & B_DELWRI) == 0)
- panic("fsync: not dirty");
- if ((vp->v_object != NULL) && (bp->b_flags & B_CLUSTEROK)) {
- vfs_bio_awrite(bp);
- } else {
- bremfree(bp);
- bawrite(bp);
- }
- if (maxretry < 1000)
- pause("dirty", hz < 1000 ? 1 : hz / 1000);
- BO_LOCK(bo);
- goto loop2;
- }
-
- /*
- * If synchronous the caller expects us to completely resolve all
- * dirty buffers in the system. Wait for in-progress I/O to
- * complete (which could include background bitmap writes), then
- * retry if dirty blocks still exist.
- */
- if (ap->a_waitfor == MNT_WAIT) {
- bufobj_wwait(bo, 0, 0);
- if (bo->bo_dirty.bv_cnt > 0) {
- /*
- * If we are unable to write any of these buffers
- * then we fail now rather than trying endlessly
- * to write them out.
- */
- TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs)
- if ((error = bp->b_error) != 0)
- break;
- if ((mp != NULL && mp->mnt_secondary_writes > 0) ||
- (error == 0 && --maxretry >= 0))
- goto loop1;
- if (error == 0)
- error = EAGAIN;
- }
- }
- BO_UNLOCK(bo);
- if (error != 0)
- vn_printf(vp, "fsync: giving up on dirty (error = %d) ", error);
-
- return (error);
+ return (vn_fsync_buf(ap->a_vp, ap->a_waitfor));
}
static int
@@ -742,12 +652,8 @@ vop_stdfdatasync(struct vop_fdatasync_args *ap)
int
vop_stdfdatasync_buf(struct vop_fdatasync_args *ap)
{
- struct vop_fsync_args apf;
- apf.a_vp = ap->a_vp;
- apf.a_waitfor = MNT_WAIT;
- apf.a_td = ap->a_td;
- return (vop_stdfsync(&apf));
+ return (vn_fsync_buf(ap->a_vp, MNT_WAIT));
}
/* XXX Needs good comment and more info in the manpage (VOP_GETPAGES(9)). */
Modified: stable/12/sys/kern/vfs_vnops.c
==============================================================================
--- stable/12/sys/kern/vfs_vnops.c Tue Apr 16 17:54:51 2019 (r346287)
+++ stable/12/sys/kern/vfs_vnops.c Tue Apr 16 17:55:54 2019 (r346288)
@@ -2490,3 +2490,98 @@ vn_fsid(struct vnode *vp, struct vattr *va)
va->va_fsid <<= sizeof(f->val[1]) * NBBY;
va->va_fsid += (uint32_t)f->val[0];
}
+
+int
+vn_fsync_buf(struct vnode *vp, int waitfor)
+{
+ struct buf *bp, *nbp;
+ struct bufobj *bo;
+ struct mount *mp;
+ int error, maxretry;
+
+ error = 0;
+ maxretry = 10000; /* large, arbitrarily chosen */
+ mp = NULL;
+ if (vp->v_type == VCHR) {
+ VI_LOCK(vp);
+ mp = vp->v_rdev->si_mountpt;
+ VI_UNLOCK(vp);
+ }
+ bo = &vp->v_bufobj;
+ BO_LOCK(bo);
+loop1:
+ /*
+ * MARK/SCAN initialization to avoid infinite loops.
+ */
+ TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) {
+ bp->b_vflags &= ~BV_SCANNED;
+ bp->b_error = 0;
+ }
+
+ /*
+ * Flush all dirty buffers associated with a vnode.
+ */
+loop2:
+ TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) {
+ if ((bp->b_vflags & BV_SCANNED) != 0)
+ continue;
+ bp->b_vflags |= BV_SCANNED;
+ if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) {
+ if (waitfor != MNT_WAIT)
+ continue;
+ if (BUF_LOCK(bp,
+ LK_EXCLUSIVE | LK_INTERLOCK | LK_SLEEPFAIL,
+ BO_LOCKPTR(bo)) != 0) {
+ BO_LOCK(bo);
+ goto loop1;
+ }
+ BO_LOCK(bo);
+ }
+ BO_UNLOCK(bo);
+ KASSERT(bp->b_bufobj == bo,
+ ("bp %p wrong b_bufobj %p should be %p",
+ bp, bp->b_bufobj, bo));
+ if ((bp->b_flags & B_DELWRI) == 0)
+ panic("fsync: not dirty");
+ if ((vp->v_object != NULL) && (bp->b_flags & B_CLUSTEROK)) {
+ vfs_bio_awrite(bp);
+ } else {
+ bremfree(bp);
+ bawrite(bp);
+ }
+ if (maxretry < 1000)
+ pause("dirty", hz < 1000 ? 1 : hz / 1000);
+ BO_LOCK(bo);
+ goto loop2;
+ }
+
+ /*
+ * If synchronous the caller expects us to completely resolve all
+ * dirty buffers in the system. Wait for in-progress I/O to
+ * complete (which could include background bitmap writes), then
+ * retry if dirty blocks still exist.
+ */
+ if (waitfor == MNT_WAIT) {
+ bufobj_wwait(bo, 0, 0);
+ if (bo->bo_dirty.bv_cnt > 0) {
+ /*
+ * If we are unable to write any of these buffers
+ * then we fail now rather than trying endlessly
+ * to write them out.
+ */
+ TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs)
+ if ((error = bp->b_error) != 0)
+ break;
+ if ((mp != NULL && mp->mnt_secondary_writes > 0) ||
+ (error == 0 && --maxretry >= 0))
+ goto loop1;
+ if (error == 0)
+ error = EAGAIN;
+ }
+ }
+ BO_UNLOCK(bo);
+ if (error != 0)
+ vn_printf(vp, "fsync: giving up on dirty (error = %d) ", error);
+
+ return (error);
+}
Modified: stable/12/sys/sys/vnode.h
==============================================================================
--- stable/12/sys/sys/vnode.h Tue Apr 16 17:54:51 2019 (r346287)
+++ stable/12/sys/sys/vnode.h Tue Apr 16 17:55:54 2019 (r346288)
@@ -669,6 +669,7 @@ int vn_close(struct vnode *vp,
int flags, struct ucred *file_cred, struct thread *td);
void vn_finished_write(struct mount *mp);
void vn_finished_secondary_write(struct mount *mp);
+int vn_fsync_buf(struct vnode *vp, int waitfor);
int vn_isdisk(struct vnode *vp, int *errp);
int _vn_lock(struct vnode *vp, int flags, char *file, int line);
#define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__)
More information about the svn-src-stable-12
mailing list