diff options
author | phk <phk@FreeBSD.org> | 2004-10-25 09:14:03 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-10-25 09:14:03 +0000 |
commit | 0e87ab8bc6e542c845f82c2bb526208587b200ad (patch) | |
tree | 200ff5f062ab8c134c56e5c8d6bd7fb2f35f6bad /sys/gnu/ext2fs | |
parent | 100e94e682f93c8aeae0f6683f1adab50f67b1f7 (diff) | |
download | FreeBSD-src-0e87ab8bc6e542c845f82c2bb526208587b200ad.zip FreeBSD-src-0e87ab8bc6e542c845f82c2bb526208587b200ad.tar.gz |
Loose the v_dirty* and v_clean* alias macros.
Check the count field where we just want to know the full/empty state,
rather than using TAILQ_EMPTY() or TAILQ_FIRST().
Diffstat (limited to 'sys/gnu/ext2fs')
-rw-r--r-- | sys/gnu/ext2fs/ext2_inode.c | 4 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index 24f41d9..d55ddfd 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 bf0a2fd..292f20e 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; |