diff options
| author | kib <kib@FreeBSD.org> | 2015-08-07 04:33:06 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-08-07 04:33:06 +0000 |
| commit | feedc474773ef4f5d277017f1df6132d0eb74fc0 (patch) | |
| tree | ef168c27c4da832dfcfb91b1df4fe34e3404495a /sys/kern/vfs_subr.c | |
| parent | 984b7d731dea8738e6ddaf5aa99948e24165db69 (diff) | |
| download | FreeBSD-src-feedc474773ef4f5d277017f1df6132d0eb74fc0.zip FreeBSD-src-feedc474773ef4f5d277017f1df6132d0eb74fc0.tar.gz | |
MFC r285384:
Do not allow creation of the dirty buffers for the dead buffer objects.
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8de6dcf..2c471af 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1584,7 +1584,8 @@ buf_vlist_add(struct buf *bp, struct bufobj *bo, b_xflags_t xflags) int error; ASSERT_BO_WLOCKED(bo); - KASSERT((bo->bo_flag & BO_DEAD) == 0, ("dead bo %p", bo)); + KASSERT((xflags & BX_VNDIRTY) == 0 || (bo->bo_flag & BO_DEAD) == 0, + ("dead bo %p", bo)); KASSERT((bp->b_xflags & (BX_VNDIRTY|BX_VNCLEAN)) == 0, ("buf_vlist_add: Buf %p has existing xflags %d", bp, bp->b_xflags)); bp->b_xflags |= xflags; @@ -2841,7 +2842,7 @@ vgonel(struct vnode *vp) while (vinvalbuf(vp, 0, 0, 0) != 0) ; } -#ifdef INVARIANTS + BO_LOCK(&vp->v_bufobj); KASSERT(TAILQ_EMPTY(&vp->v_bufobj.bo_dirty.bv_hd) && vp->v_bufobj.bo_dirty.bv_cnt == 0 && @@ -2850,7 +2851,6 @@ vgonel(struct vnode *vp) ("vp %p bufobj not invalidated", vp)); vp->v_bufobj.bo_flag |= BO_DEAD; BO_UNLOCK(&vp->v_bufobj); -#endif /* * Reclaim the vnode. |
