From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Fri, 31 Dec 1993 08:13:43 +0000 (-0800)
Subject: new queue structure
X-Git-Tag: BSD-4_4_Lite1-Snapshot-Development~1142
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/b740ac27e42fda56c4f8daab2c8604dcf4bcc14b

new queue structure

SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 8.4
SCCS-vsn: sys/ufs/lfs/lfs_bio.c 8.4
---

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index cea7b28374..7ce577c61e 100644
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ffs_vnops.c	8.3 (Berkeley) %G%
+ *	@(#)ffs_vnops.c	8.4 (Berkeley) %G%
  */
 
 #include <sys/param.h>
@@ -217,8 +217,8 @@ ffs_fsync(ap)
 	 */
 loop:
 	s = splbio();
-	for (bp = vp->v_dirtyblkhd.le_next; bp; bp = nbp) {
-		nbp = bp->b_vnbufs.qe_next;
+	for (bp = vp->v_dirtyblkhd.lh_first; bp; bp = nbp) {
+		nbp = bp->b_vnbufs.le_next;
 		if ((bp->b_flags & B_BUSY))
 			continue;
 		if ((bp->b_flags & B_DELWRI) == 0)
@@ -242,7 +242,7 @@ loop:
 			sleep((caddr_t)&vp->v_numoutput, PRIBIO + 1);
 		}
 #ifdef DIAGNOSTIC
-		if (vp->v_dirtyblkhd.le_next) {
+		if (vp->v_dirtyblkhd.lh_first) {
 			vprint("ffs_fsync: dirty", vp);
 			goto loop;
 		}
diff --git a/usr/src/sys/ufs/lfs/lfs_bio.c b/usr/src/sys/ufs/lfs/lfs_bio.c
index 42355a73d3..ea075cb7f5 100644
--- a/usr/src/sys/ufs/lfs/lfs_bio.c
+++ b/usr/src/sys/ufs/lfs/lfs_bio.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)lfs_bio.c	8.3 (Berkeley) %G%
+ *	@(#)lfs_bio.c	8.4 (Berkeley) %G%
  */
 
 #include <sys/param.h>
@@ -113,8 +113,7 @@ lfs_flush()
 	if (lfs_writing)
 		return;
 	lfs_writing = 1;
-	mp = rootfs;
-	do {
+	for (mp = mountlist.tqh_first; mp != NULL; mp = mp->mnt_list.tqe_next) {
 		/* The lock check below is to avoid races with unmount. */
 		if (mp->mnt_stat.f_type == MOUNT_LFS &&
 		    (mp->mnt_flag & (MNT_MLOCK|MNT_RDONLY|MNT_UNMOUNT)) == 0 &&
@@ -131,8 +130,7 @@ lfs_flush()
 #endif
 			lfs_segwrite(mp, 0);
 		}
-		mp = mp->mnt_next;
-	} while (mp != rootfs);
+	}
 	lfs_writing = 0;
 }