diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-10-25 09:14:03 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-10-25 09:14:03 +0000 |
| commit | 156cb26583261189ef25d1535ec92e4244adb0f8 (patch) | |
| tree | 200ff5f062ab8c134c56e5c8d6bd7fb2f35f6bad /sys/gnu | |
| parent | 4fda9f547d0d9b95a776a8cfd0fa34a7624f41b1 (diff) | |
Notes
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_inode.c | 4 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode.c | 4 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index 24f41d9a7343..d55ddfdc4dff 100644 --- a/sys/gnu/ext2fs/ext2_inode.c +++ b/sys/gnu/ext2fs/ext2_inode.c @@ -326,8 +326,8 @@ done: if (newblks[i] != oip->i_db[i]) panic("itrunc2"); VI_LOCK(ovp); - if (length == 0 && (!TAILQ_EMPTY(&ovp->v_dirtyblkhd) || - !TAILQ_EMPTY(&ovp->v_cleanblkhd))) + if (length == 0 && (ovp->v_bufobj.bo_dirty.bv_cnt != 0 || + ovp->v_bufobj.bo_clean.bv_cnt != 0)) panic("itrunc3"); VI_UNLOCK(ovp); #endif /* DIAGNOSTIC */ diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index bf0a2fd2edcb..292f20e09d34 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -931,7 +931,8 @@ loop: if (vp->v_type == VNON || ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && - (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY))) { + (vp->v_bufobj.bo_dirty.bv_cnt == 0 || + waitfor == MNT_LAZY))) { VI_UNLOCK(vp); MNT_ILOCK(mp); continue; diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index 24f41d9a7343..d55ddfdc4dff 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -326,8 +326,8 @@ done: if (newblks[i] != oip->i_db[i]) panic("itrunc2"); VI_LOCK(ovp); - if (length == 0 && (!TAILQ_EMPTY(&ovp->v_dirtyblkhd) || - !TAILQ_EMPTY(&ovp->v_cleanblkhd))) + if (length == 0 && (ovp->v_bufobj.bo_dirty.bv_cnt != 0 || + ovp->v_bufobj.bo_clean.bv_cnt != 0)) panic("itrunc3"); VI_UNLOCK(ovp); #endif /* DIAGNOSTIC */ diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index bf0a2fd2edcb..292f20e09d34 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -931,7 +931,8 @@ loop: if (vp->v_type == VNON || ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && - (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY))) { + (vp->v_bufobj.bo_dirty.bv_cnt == 0 || + waitfor == MNT_LAZY))) { VI_UNLOCK(vp); MNT_ILOCK(mp); continue; |