Mechanical change to use <sys/queue.h> macro API instead of

fondling implementation details.

Created with: sed(1)
Reviewed by: md5(1)

4 files changed, 26 insertions, 26 deletions

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 0dab2f1..5507262 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1200,7 +1200,7 @@ bmsafemap_lookup(bp)
 	if (lk.lkt_held == -1)
 		panic("bmsafemap_lookup: lock not held");
 #endif
-	for (wk = LIST_FIRST(&bp->b_dep); wk; wk = LIST_NEXT(wk, wk_list))
+	LIST_FOREACH(wk, &bp->b_dep, wk_list)
 		if (wk->wk_type == D_BMSAFEMAP)
 			return (WK_BMSAFEMAP(wk));
 	FREE_LOCK(&lk);
@@ -4665,7 +4665,7 @@ softdep_count_dependencies(bp, wantcount)
 
 	retval = 0;
 	ACQUIRE_LOCK(&lk);
-	for (wk = LIST_FIRST(&bp->b_dep); wk; wk = LIST_NEXT(wk, wk_list)) {
+	LIST_FOREACH(wk, &bp->b_dep, wk_list) {
 		switch (wk->wk_type) {
 
 		case D_INODEDEP:
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index cf2c1b1..fee14d7 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -455,12 +455,12 @@ ffs_reload(mp, cred, p)
 
 loop:
 	mtx_enter(&mntvnode_mtx, MTX_DEF);
-	for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) {
+	for (vp = LIST_FIRST(&mp->mnt_vnodelist); vp != NULL; vp = nvp) {
 		if (vp->v_mount != mp) {
 			mtx_exit(&mntvnode_mtx, MTX_DEF);
 			goto loop;
 		}
-		nvp = vp->v_mntvnodes.le_next;
+		nvp = LIST_NEXT(vp, v_mntvnodes);
 		/*
 		 * Step 4: invalidate all inactive vnodes.
 		 */
@@ -939,7 +939,7 @@ ffs_sync(mp, waitfor, cred, p)
 	}
 	mtx_enter(&mntvnode_mtx, MTX_DEF);
 loop:
-	for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) {
+	for (vp = LIST_FIRST(&mp->mnt_vnodelist); vp != NULL; vp = nvp) {
 		/*
 		 * If the vnode that we are about to sync is no longer
 		 * associated with this mount point, start over.
@@ -947,7 +947,7 @@ loop:
 		if (vp->v_mount != mp)
 			goto loop;
 		mtx_enter(&vp->v_interlock, MTX_DEF);
-		nvp = vp->v_mntvnodes.le_next;
+		nvp = LIST_NEXT(vp, v_mntvnodes);
 		ip = VTOI(vp);
 		if (vp->v_type == VNON || ((ip->i_flag &
 		     (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 &&
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 90348e3..143c734 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -116,9 +116,9 @@ ufs_extattr_find_attr(struct ufsmount *ump, const char *attrname)
 {
 	struct ufs_extattr_list_entry	*search_attribute;
 
-	for (search_attribute = ump->um_extattr.uepm_list.lh_first;
+	for (search_attribute = LIST_FIRST(&ump->um_extattr.uepm_list);
 	    search_attribute;
-	    search_attribute = search_attribute->uele_entries.le_next) {
+	    search_attribute = LIST_NEXT(search_attribute, uele_entries)) {
 		if (!(strncmp(attrname, search_attribute->uele_attrname,
 		    UFS_EXTATTR_MAXEXTATTRNAME))) {
 			return (search_attribute);
@@ -217,8 +217,8 @@ ufs_extattr_stop(struct mount *mp, struct proc *p)
 		goto unlock;
 	}
 
-	while (ump->um_extattr.uepm_list.lh_first != NULL) {
-		uele = ump->um_extattr.uepm_list.lh_first;
+	while (LIST_FIRST(&ump->um_extattr.uepm_list) != NULL) {
+		uele = LIST_FIRST(&ump->um_extattr.uepm_list);
 		ufs_extattr_disable(ump, uele->uele_attrname, p);
 	}
 
@@ -888,8 +888,8 @@ ufs_extattr_vnode_inactive(struct vnode *vp, struct proc *p)
 		return;
 	}
 
-	for (uele = ump->um_extattr.uepm_list.lh_first; uele != NULL;
-	    uele = uele->uele_entries.le_next)
+	for (uele = LIST_FIRST(&ump->um_extattr.uepm_list); uele != NULL;
+	    uele = LIST_NEXT(uele, uele_entries))
 		ufs_extattr_rm(vp, uele->uele_attrname, NULL, p);
 
 	ufs_extattr_uepm_unlock(ump, p);
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 58dad6e..1b3c69a 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -436,8 +436,8 @@ quotaon(p, mp, type, fname)
 	 * NB: only need to add dquot's for inodes being modified.
 	 */
 again:
-	for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nextvp) {
-		nextvp = vp->v_mntvnodes.le_next;
+	for (vp = LIST_FIRST(&mp->mnt_vnodelist); vp != NULL; vp = nextvp) {
+		nextvp = LIST_NEXT(vp, v_mntvnodes);
 		if (vp->v_type == VNON || vp->v_writecount == 0)
 			continue;
 		if (vget(vp, LK_EXCLUSIVE, p))
@@ -448,7 +448,7 @@ again:
 			break;
 		}
 		vput(vp);
-		if (vp->v_mntvnodes.le_next != nextvp || vp->v_mount != mp)
+		if (LIST_NEXT(vp, v_mntvnodes) != nextvp || vp->v_mount != mp)
 			goto again;
 	}
 	ump->um_qflags[type] &= ~QTF_OPENING;
@@ -481,8 +481,8 @@ quotaoff(p, mp, type)
 	 * deleting any references to quota file being closed.
 	 */
 again:
-	for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nextvp) {
-		nextvp = vp->v_mntvnodes.le_next;
+	for (vp = LIST_FIRST(&mp->mnt_vnodelist); vp != NULL; vp = nextvp) {
+		nextvp = LIST_NEXT(vp, v_mntvnodes);
 		if (vp->v_type == VNON)
 			continue;
 		if (vget(vp, LK_EXCLUSIVE, p))
@@ -492,7 +492,7 @@ again:
 		ip->i_dquot[type] = NODQUOT;
 		dqrele(vp, dq);
 		vput(vp);
-		if (vp->v_mntvnodes.le_next != nextvp || vp->v_mount != mp)
+		if (LIST_NEXT(vp, v_mntvnodes) != nextvp || vp->v_mount != mp)
 			goto again;
 	}
 	dqflush(qvp);
@@ -668,10 +668,10 @@ qsync(mp)
 	 */
 	mtx_enter(&mntvnode_mtx, MTX_DEF);
 again:
-	for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nextvp) {
+	for (vp = LIST_FIRST(&mp->mnt_vnodelist); vp != NULL; vp = nextvp) {
 		if (vp->v_mount != mp)
 			goto again;
-		nextvp = vp->v_mntvnodes.le_next;
+		nextvp = LIST_NEXT(vp, v_mntvnodes);
 		if (vp->v_type == VNON)
 			continue;
 		mtx_enter(&vp->v_interlock, MTX_DEF);
@@ -690,7 +690,7 @@ again:
 		}
 		vput(vp);
 		mtx_enter(&mntvnode_mtx, MTX_DEF);
-		if (vp->v_mntvnodes.le_next != nextvp)
+		if (LIST_NEXT(vp, v_mntvnodes) != nextvp)
 			goto again;
 	}
 	mtx_exit(&mntvnode_mtx, MTX_DEF);
@@ -752,7 +752,7 @@ dqget(vp, id, ump, type, dqp)
 	 * Check the cache first.
 	 */
 	dqh = DQHASH(dqvp, id);
-	for (dq = dqh->lh_first; dq; dq = dq->dq_hash.le_next) {
+	LIST_FOREACH(dq, dqh, dq_hash) {
 		if (dq->dq_id != id ||
 		    dq->dq_ump->um_quotas[dq->dq_type] != dqvp)
 			continue;
@@ -769,7 +769,7 @@ dqget(vp, id, ump, type, dqp)
 	/*
 	 * Not in cache, allocate a new one.
 	 */
-	if (dqfreelist.tqh_first == NODQUOT &&
+	if (TAILQ_FIRST(&dqfreelist) == NODQUOT &&
 	    numdquot < MAXQUOTAS * desiredvnodes)
 		desireddquot += DQUOTINC;
 	if (numdquot < desireddquot) {
@@ -777,7 +777,7 @@ dqget(vp, id, ump, type, dqp)
 		    M_WAITOK | M_ZERO);
 		numdquot++;
 	} else {
-		if ((dq = dqfreelist.tqh_first) == NULL) {
+		if ((dq = TAILQ_FIRST(&dqfreelist)) == NULL) {
 			tablefull("dquot");
 			*dqp = NODQUOT;
 			return (EUSERS);
@@ -946,8 +946,8 @@ dqflush(vp)
 	 * fall off the head of the free list and be re-used).
 	 */
 	for (dqh = &dqhashtbl[dqhash]; dqh >= dqhashtbl; dqh--) {
-		for (dq = dqh->lh_first; dq; dq = nextdq) {
-			nextdq = dq->dq_hash.le_next;
+		for (dq = LIST_FIRST(dqh); dq; dq = nextdq) {
+			nextdq = LIST_NEXT(dq, dq_hash);
 			if (dq->dq_ump->um_quotas[dq->dq_type] != vp)
 				continue;
 			if (dq->dq_cnt)