From 5a4b35079b8d50d90fc432840b5e36b3c66b6c44 Mon Sep 17 00:00:00 2001 From: delphij Date: Wed, 4 Apr 2007 07:29:53 +0000 Subject: Use *_EMPTY macros when appropriate. --- sys/ufs/ffs/ffs_snapshot.c | 4 +-- sys/ufs/ffs/ffs_softdep.c | 66 +++++++++++++++++++++++----------------------- sys/ufs/ffs/ffs_vfsops.c | 10 +++---- sys/ufs/ffs/ffs_vnops.c | 14 +++++----- 4 files changed, 47 insertions(+), 47 deletions(-) (limited to 'sys/ufs') diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index d94bd6d..97b8a2e 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -2209,7 +2209,7 @@ ffs_copyonwrite(devvp, bp) VI_LOCK(devvp); sn = devvp->v_rdev->si_snapdata; if (sn == NULL || - TAILQ_FIRST(&sn->sn_head) == NULL) { + TAILQ_EMPTY(&sn->sn_head)) { VI_UNLOCK(devvp); return (0); /* No snapshot */ } @@ -2251,7 +2251,7 @@ ffs_copyonwrite(devvp, bp) VI_LOCK(devvp); sn = devvp->v_rdev->si_snapdata; if (sn == NULL || - TAILQ_FIRST(&sn->sn_head) == NULL) { + TAILQ_EMPTY(&sn->sn_head)) { VI_UNLOCK(devvp); if (saved_runningbufspace != 0) { bp->b_runningbufspace = saved_runningbufspace; diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 08d9908..482deb8 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -806,7 +806,7 @@ add_to_worklist(wk) if (wk->wk_state & ONWORKLIST) panic("add_to_worklist: already on list"); wk->wk_state |= ONWORKLIST; - if (LIST_FIRST(&ump->softdep_workitem_pending) == NULL) + if (LIST_EMPTY(&ump->softdep_workitem_pending)) LIST_INSERT_HEAD(&ump->softdep_workitem_pending, wk, wk_list); else LIST_INSERT_AFTER(ump->softdep_worklist_tail, wk, wk_list); @@ -993,7 +993,7 @@ softdep_move_dependencies(oldbp, newbp) { struct worklist *wk, *wktail; - if (LIST_FIRST(&newbp->b_dep) != NULL) + if (!LIST_EMPTY(&newbp->b_dep)) panic("softdep_move_dependencies: need merge code"); wktail = 0; ACQUIRE_LOCK(&lk); @@ -1779,7 +1779,7 @@ allocdirect_merge(adphead, newadp, oldadp) if ((wk = LIST_FIRST(&oldadp->ad_newdirblk)) != NULL) { newdirblk = WK_NEWDIRBLK(wk); WORKLIST_REMOVE(&newdirblk->db_list); - if (LIST_FIRST(&oldadp->ad_newdirblk) != NULL) + if (!LIST_EMPTY(&oldadp->ad_newdirblk)) panic("allocdirect_merge: extra newdirblk"); WORKLIST_INSERT(&newadp->ad_newdirblk, &newdirblk->db_list); } @@ -2507,7 +2507,7 @@ free_allocdirect(adphead, adp, delay) if ((wk = LIST_FIRST(&adp->ad_newdirblk)) != NULL) { newdirblk = WK_NEWDIRBLK(wk); WORKLIST_REMOVE(&newdirblk->db_list); - if (LIST_FIRST(&adp->ad_newdirblk) != NULL) + if (!LIST_EMPTY(&adp->ad_newdirblk)) panic("free_allocdirect: extra newdirblk"); if (delay) WORKLIST_INSERT(&adp->ad_inodedep->id_bufwait, @@ -2550,7 +2550,7 @@ free_newdirblk(newdirblk) * If no dependencies remain, the pagedep will be freed. */ for (i = 0; i < DAHASHSZ; i++) - if (LIST_FIRST(&pagedep->pd_diraddhd[i]) != NULL) + if (!LIST_EMPTY(&pagedep->pd_diraddhd[i])) break; if (i == DAHASHSZ && (pagedep->pd_state & ONWORKLIST) == 0) { LIST_REMOVE(pagedep, pd_hash); @@ -2627,13 +2627,13 @@ check_inode_unwritten(inodedep) mtx_assert(&lk, MA_OWNED); if ((inodedep->id_state & DEPCOMPLETE) != 0 || - LIST_FIRST(&inodedep->id_pendinghd) != NULL || - LIST_FIRST(&inodedep->id_bufwait) != NULL || - LIST_FIRST(&inodedep->id_inowait) != NULL || - TAILQ_FIRST(&inodedep->id_inoupdt) != NULL || - TAILQ_FIRST(&inodedep->id_newinoupdt) != NULL || - TAILQ_FIRST(&inodedep->id_extupdt) != NULL || - TAILQ_FIRST(&inodedep->id_newextupdt) != NULL || + !LIST_EMPTY(&inodedep->id_pendinghd) || + !LIST_EMPTY(&inodedep->id_bufwait) || + !LIST_EMPTY(&inodedep->id_inowait) || + !TAILQ_EMPTY(&inodedep->id_inoupdt) || + !TAILQ_EMPTY(&inodedep->id_newinoupdt) || + !TAILQ_EMPTY(&inodedep->id_extupdt) || + !TAILQ_EMPTY(&inodedep->id_newextupdt) || inodedep->id_nlinkdelta != 0) return (0); @@ -2670,13 +2670,13 @@ free_inodedep(inodedep) mtx_assert(&lk, MA_OWNED); if ((inodedep->id_state & ONWORKLIST) != 0 || (inodedep->id_state & ALLCOMPLETE) != ALLCOMPLETE || - LIST_FIRST(&inodedep->id_pendinghd) != NULL || - LIST_FIRST(&inodedep->id_bufwait) != NULL || - LIST_FIRST(&inodedep->id_inowait) != NULL || - TAILQ_FIRST(&inodedep->id_inoupdt) != NULL || - TAILQ_FIRST(&inodedep->id_newinoupdt) != NULL || - TAILQ_FIRST(&inodedep->id_extupdt) != NULL || - TAILQ_FIRST(&inodedep->id_newextupdt) != NULL || + !LIST_EMPTY(&inodedep->id_pendinghd) || + !LIST_EMPTY(&inodedep->id_bufwait) || + !LIST_EMPTY(&inodedep->id_inowait) || + !TAILQ_EMPTY(&inodedep->id_inoupdt) || + !TAILQ_EMPTY(&inodedep->id_newinoupdt) || + !TAILQ_EMPTY(&inodedep->id_extupdt) || + !TAILQ_EMPTY(&inodedep->id_newextupdt) || inodedep->id_nlinkdelta != 0 || inodedep->id_savedino1 != NULL) return (0); LIST_REMOVE(inodedep, id_hash); @@ -2852,7 +2852,7 @@ indir_trunc(freeblks, dbn, level, lbn, countp) panic("indir_trunc: lost indirdep"); WORKLIST_REMOVE(wk); WORKITEM_FREE(indirdep, D_INDIRDEP); - if (LIST_FIRST(&bp->b_dep) != NULL) + if (!LIST_EMPTY(&bp->b_dep)) panic("indir_trunc: dangling dep"); ump->um_numindirdeps -= 1; FREE_LOCK(&lk); @@ -3767,7 +3767,7 @@ softdep_disk_io_initiation(bp) * will be writing the real pointers, so the * dependency can be freed. */ - if (LIST_FIRST(&indirdep->ir_deplisthd) == NULL) { + if (LIST_EMPTY(&indirdep->ir_deplisthd)) { struct buf *bp; bp = indirdep->ir_savebp; @@ -3904,7 +3904,7 @@ initiate_write_inodeblock_ufs1(inodedep, bp) */ inodedep->id_savedsize = dp->di_size; inodedep->id_savedextsize = 0; - if (TAILQ_FIRST(&inodedep->id_inoupdt) == NULL) + if (TAILQ_EMPTY(&inodedep->id_inoupdt)) return; /* * Set the dependencies to busy. @@ -4047,8 +4047,8 @@ initiate_write_inodeblock_ufs2(inodedep, bp) */ inodedep->id_savedsize = dp->di_size; inodedep->id_savedextsize = dp->di_extsize; - if (TAILQ_FIRST(&inodedep->id_inoupdt) == NULL && - TAILQ_FIRST(&inodedep->id_extupdt) == NULL) + if (TAILQ_EMPTY(&inodedep->id_inoupdt) && + TAILQ_EMPTY(&inodedep->id_extupdt)) return; /* * Set the ext data dependencies to busy. @@ -4905,10 +4905,10 @@ softdep_update_inodeblock(ip, bp, waitfor) * allocdirects that are completed by the merger. */ merge_inode_lists(&inodedep->id_newinoupdt, &inodedep->id_inoupdt); - if (TAILQ_FIRST(&inodedep->id_inoupdt) != NULL) + if (!TAILQ_EMPTY(&inodedep->id_inoupdt)) handle_allocdirect_partdone(TAILQ_FIRST(&inodedep->id_inoupdt)); merge_inode_lists(&inodedep->id_newextupdt, &inodedep->id_extupdt); - if (TAILQ_FIRST(&inodedep->id_extupdt) != NULL) + if (!TAILQ_EMPTY(&inodedep->id_extupdt)) handle_allocdirect_partdone(TAILQ_FIRST(&inodedep->id_extupdt)); /* * Now that the inode has been pushed into the buffer, the @@ -5017,12 +5017,12 @@ softdep_fsync(vp) FREE_LOCK(&lk); return (0); } - if (LIST_FIRST(&inodedep->id_inowait) != NULL || - LIST_FIRST(&inodedep->id_bufwait) != NULL || - TAILQ_FIRST(&inodedep->id_extupdt) != NULL || - TAILQ_FIRST(&inodedep->id_newextupdt) != NULL || - TAILQ_FIRST(&inodedep->id_inoupdt) != NULL || - TAILQ_FIRST(&inodedep->id_newinoupdt) != NULL) + if (!LIST_EMPTY(&inodedep->id_inowait) || + !LIST_EMPTY(&inodedep->id_bufwait) || + !TAILQ_EMPTY(&inodedep->id_extupdt) || + !TAILQ_EMPTY(&inodedep->id_newextupdt) || + !TAILQ_EMPTY(&inodedep->id_inoupdt) || + !TAILQ_EMPTY(&inodedep->id_newinoupdt)) panic("softdep_fsync: pending ops"); for (error = 0, flushparent = 0; ; ) { if ((wk = LIST_FIRST(&inodedep->id_pendinghd)) == NULL) @@ -5876,7 +5876,7 @@ clear_remove(td) if (next >= pagedep_hash) next = 0; LIST_FOREACH(pagedep, pagedephd, pd_hash) { - if (LIST_FIRST(&pagedep->pd_dirremhd) == NULL) + if (LIST_EMPTY(&pagedep->pd_dirremhd)) continue; mp = pagedep->pd_list.wk_mp; ino = pagedep->pd_ino; diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 4357e86..4eb8914 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1662,10 +1662,10 @@ ffs_backgroundwritedone(struct buf *bp) /* * Process dependencies then return any unfinished ones. */ - if (LIST_FIRST(&bp->b_dep) != NULL) + if (!LIST_EMPTY(&bp->b_dep)) buf_complete(bp); #ifdef SOFTUPDATES - if (LIST_FIRST(&bp->b_dep) != NULL) + if (!LIST_EMPTY(&bp->b_dep)) softdep_move_dependencies(bp, origbp); #endif /* @@ -1783,7 +1783,7 @@ ffs_bufwrite(struct buf *bp) #ifdef SOFTUPDATES /* move over the dependencies */ - if (LIST_FIRST(&bp->b_dep) != NULL) + if (!LIST_EMPTY(&bp->b_dep)) softdep_move_dependencies(bp, newbp); #endif @@ -1850,11 +1850,11 @@ ffs_geom_strategy(struct bufobj *bo, struct buf *bp) if ((bp->b_flags & B_CLUSTER) != 0) { TAILQ_FOREACH(tbp, &bp->b_cluster.cluster_head, b_cluster.cluster_entry) { - if (LIST_FIRST(&tbp->b_dep) != NULL) + if (!LIST_EMPTY(&tbp->b_dep)) buf_start(tbp); } } else { - if (LIST_FIRST(&bp->b_dep) != NULL) + if (!LIST_EMPTY(&bp->b_dep)) buf_start(bp); } diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 7d2eade..a562db0 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -232,7 +232,7 @@ loop: if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) continue; VI_UNLOCK(vp); - if (!wait && LIST_FIRST(&bp->b_dep) != NULL && + if (!wait && !LIST_EMPTY(&bp->b_dep) && (bp->b_flags & B_DEFERRED) == 0 && buf_countdeps(bp, 0)) { bp->b_flags |= B_DEFERRED; @@ -565,7 +565,7 @@ ffs_read(ap) break; if ((ioflag & (IO_VMIO|IO_DIRECT)) && - (LIST_FIRST(&bp->b_dep) == NULL)) { + (LIST_EMPTY(&bp->b_dep))) { /* * If there are no dependencies, and it's VMIO, * then we don't need the buf, mark it available @@ -592,7 +592,7 @@ ffs_read(ap) */ if (bp != NULL) { if ((ioflag & (IO_VMIO|IO_DIRECT)) && - (LIST_FIRST(&bp->b_dep) == NULL)) { + (LIST_EMPTY(&bp->b_dep))) { bp->b_flags |= B_RELBUF; brelse(bp); } else { @@ -747,7 +747,7 @@ ffs_write(ap) error = uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio); if ((ioflag & (IO_VMIO|IO_DIRECT)) && - (LIST_FIRST(&bp->b_dep) == NULL)) { + (LIST_EMPTY(&bp->b_dep))) { bp->b_flags |= B_RELBUF; } @@ -967,7 +967,7 @@ ffs_extread(struct vnode *vp, struct uio *uio, int ioflag) break; if ((ioflag & (IO_VMIO|IO_DIRECT)) && - (LIST_FIRST(&bp->b_dep) == NULL)) { + (LIST_EMPTY(&bp->b_dep))) { /* * If there are no dependencies, and it's VMIO, * then we don't need the buf, mark it available @@ -994,7 +994,7 @@ ffs_extread(struct vnode *vp, struct uio *uio, int ioflag) */ if (bp != NULL) { if ((ioflag & (IO_VMIO|IO_DIRECT)) && - (LIST_FIRST(&bp->b_dep) == NULL)) { + (LIST_EMPTY(&bp->b_dep))) { bp->b_flags |= B_RELBUF; brelse(bp); } else { @@ -1091,7 +1091,7 @@ ffs_extwrite(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *ucred) error = uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio); if ((ioflag & (IO_VMIO|IO_DIRECT)) && - (LIST_FIRST(&bp->b_dep) == NULL)) { + (LIST_EMPTY(&bp->b_dep))) { bp->b_flags |= B_RELBUF; } -- cgit v1.1