diff options
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 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vnops.c | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index 933d031..02f4a62 100644 --- a/sys/gnu/ext2fs/ext2_inode.c +++ b/sys/gnu/ext2fs/ext2_inode.c @@ -349,8 +349,8 @@ done: for (i = 0; i < NDADDR; i++) if (newblks[i] != oip->i_db[i]) panic("itrunc2"); - if (length == 0 && - (ovp->v_dirtyblkhd.lh_first || ovp->v_cleanblkhd.lh_first)) + if (length == 0 && (!TAILQ_EMPTY(&ovp->v_dirtyblkhd) || + !TAILQ_EMPTY(&ovp->v_cleanblkhd))) panic("itrunc3"); #endif /* DIAGNOSTIC */ /* diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index ef80d74..446ef3b 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -919,8 +919,7 @@ loop: if (vp->v_type == VNON || (ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && - (vp->v_dirtyblkhd.lh_first == NULL || - waitfor == MNT_LAZY)) { + (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY)) { simple_unlock(&vp->v_interlock); continue; } diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index 07e94b8..8b7ac7d 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -197,8 +197,8 @@ ext2_fsync(ap) loop: s = splbio(); - for (bp = vp->v_dirtyblkhd.lh_first; bp; bp = nbp) { - nbp = bp->b_vnbufs.le_next; + for (bp = TAILQ_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) { + nbp = TAILQ_NEXT(bp, b_vnbufs); if ((bp->b_flags & B_BUSY)) continue; if ((bp->b_flags & B_DELWRI) == 0) @@ -222,7 +222,7 @@ loop: tsleep(&vp->v_numoutput, PRIBIO + 1, "e2fsyn", 0); } #if DIAGNOSTIC - if (vp->v_dirtyblkhd.lh_first) { + if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) { vprint("ext2_fsync: dirty", vp); goto loop; } |
