Page MenuHomeFreeBSD
Files F163566277

D46963.id144463.diff
No OneTemporary
Actions

D46963.id144463.diff
View Options

Index: sys/kern/vfs_subr.c
===================================================================
--- sys/kern/vfs_subr.c
+++ sys/kern/vfs_subr.c
@@ -2616,61 +2616,46 @@
v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo,
daddr_t startlbn, daddr_t endlbn)
{
+ struct bufv *bv;
struct buf *bp, *nbp;
- bool anyfreed;
+ b_xflags_t anyfreed, xflags;
+ uint32_t flags;
ASSERT_VOP_LOCKED(vp, "v_inval_buf_range_locked");
ASSERT_BO_LOCKED(bo);
- do {
- anyfreed = false;
- TAILQ_FOREACH_SAFE(bp, &bo->bo_clean.bv_hd, b_bobufs, nbp) {
- if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn)
- continue;
+ anyfreed = BX_VNDIRTY;
+ for (bv = &bo->bo_clean, xflags = BX_VNCLEAN, flags = B_DELWRI;
+ anyfreed != 0;
+ bv = &bo->bo_clean - bv + &bo->bo_dirty,
+ xflags ^= BX_VNCLEAN | BX_VNDIRTY, flags ^= B_DELWRI) {
+ anyfreed &= ~xflags;
+ bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, startlbn);
+ if (bp == NULL)
+ continue;
+ TAILQ_FOREACH_FROM_SAFE(bp, &bv->bv_hd, b_bobufs, nbp) {
+ if (bp->b_lblkno >= endlbn)
+ break;
if (BUF_LOCK(bp,
LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK,
BO_LOCKPTR(bo)) == ENOLCK) {
BO_LOCK(bo);
return (EAGAIN);
}
-
bremfree(bp);
bp->b_flags |= B_INVAL | B_RELBUF;
bp->b_flags &= ~B_ASYNC;
brelse(bp);
- anyfreed = true;
+ anyfreed |= xflags;
BO_LOCK(bo);
if (nbp != NULL &&
- (((nbp->b_xflags & BX_VNCLEAN) == 0) ||
+ (((nbp->b_xflags & xflags) == 0) ||
nbp->b_vp != vp ||
- (nbp->b_flags & B_DELWRI) != 0))
+ (nbp->b_flags & B_DELWRI) == flags))
return (EAGAIN);
}
-
- TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) {
- if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn)
- continue;
- if (BUF_LOCK(bp,
- LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK,
- BO_LOCKPTR(bo)) == ENOLCK) {
- BO_LOCK(bo);
- return (EAGAIN);
- }
- bremfree(bp);
- bp->b_flags |= B_INVAL | B_RELBUF;
- bp->b_flags &= ~B_ASYNC;
- brelse(bp);
- anyfreed = true;
-
- BO_LOCK(bo);
- if (nbp != NULL &&
- (((nbp->b_xflags & BX_VNDIRTY) == 0) ||
- (nbp->b_vp != vp) ||
- (nbp->b_flags & B_DELWRI) == 0))
- return (EAGAIN);
- }
- } while (anyfreed);
+ }
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 25, 1:41 PM (10 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35475296
Default Alt Text
D46963.id144463.diff (2 KB)

Event Timeline