diff options
| author | phk <phk@FreeBSD.org> | 2004-10-21 15:53:54 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-10-21 15:53:54 +0000 |
| commit | 3833976d1250bf118a46939f409012d87e558de6 (patch) | |
| tree | 9d355bca75100170618443d740a1312fd842af5d /sys/kern/vfs_default.c | |
| parent | fdf614c0bad1564664cac5105be08477d1bcdd72 (diff) | |
| download | FreeBSD-src-3833976d1250bf118a46939f409012d87e558de6.zip FreeBSD-src-3833976d1250bf118a46939f409012d87e558de6.tar.gz | |
Move the VI_BWAIT flag into no bo_flag element of bufobj and call it BO_WWAIT
Add bufobj_wref(), bufobj_wdrop() and bufobj_wwait() to handle the write
count on a bufobj. Bufobj_wdrop() replaces vwakeup().
Use these functions all relevant places except in ffs_softdep.c where
the use if interlocked_sleep() makes this impossible.
Rename b_vnbufs to b_bobufs now that we touch all the relevant files anyway.
Diffstat (limited to 'sys/kern/vfs_default.c')
| -rw-r--r-- | sys/kern/vfs_default.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 08f2953..72e03bf 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -539,6 +539,7 @@ vop_stdfsync(ap) { struct vnode *vp = ap->a_vp; struct buf *bp; + struct bufobj *bo; struct buf *nbp; int s, error = 0; int maxretry = 100; /* large, arbitrarily chosen */ @@ -549,7 +550,7 @@ loop1: * MARK/SCAN initialization to avoid infinite loops. */ s = splbio(); - TAILQ_FOREACH(bp, &vp->v_dirtyblkhd, b_vnbufs) { + TAILQ_FOREACH(bp, &vp->v_dirtyblkhd, b_bobufs) { bp->b_vflags &= ~BV_SCANNED; bp->b_error = 0; } @@ -561,7 +562,7 @@ loop1: loop2: s = splbio(); for (bp = TAILQ_FIRST(&vp->v_dirtyblkhd); bp != NULL; bp = nbp) { - nbp = TAILQ_NEXT(bp, b_vnbufs); + nbp = TAILQ_NEXT(bp, b_bobufs); if ((bp->b_vflags & BV_SCANNED) != 0) continue; bp->b_vflags |= BV_SCANNED; @@ -589,18 +590,15 @@ loop2: * retry if dirty blocks still exist. */ if (ap->a_waitfor == MNT_WAIT) { - while (vp->v_numoutput) { - vp->v_iflag |= VI_BWAIT; - msleep((caddr_t)&vp->v_numoutput, VI_MTX(vp), - PRIBIO + 1, "fsync", 0); - } - if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) { + bo = &vp->v_bufobj; + 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, &vp->v_dirtyblkhd, b_vnbufs) + TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) if ((error = bp->b_error) == 0) continue; if (error == 0 && --maxretry >= 0) { |
