s/biowait/bufwait/g

Prodded by: several.

4 files changed, 10 insertions, 10 deletions

diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index f3f7b98..fc7fb28 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -183,7 +183,7 @@ readdisklabel(dev, lp)
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
 	DEV_STRATEGY(bp, 1);
-	if (biowait(bp))
+	if (bufwait(bp))
 		msg = "I/O error";
 	else for (dlp = (struct disklabel *)bp->b_data;
 	    dlp <= (struct disklabel *)((char *)bp->b_data +
@@ -286,7 +286,7 @@ writedisklabel(dev, lp)
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
 	DEV_STRATEGY(bp, 1);
-	error = biowait(bp);
+	error = bufwait(bp);
 	if (error)
 		goto done;
 	for (dlp = (struct disklabel *)bp->b_data;
@@ -302,7 +302,7 @@ writedisklabel(dev, lp)
 			alpha_fix_srm_checksum(bp);
 #endif
 			DEV_STRATEGY(bp, 1);
-			error = biowait(bp);
+			error = bufwait(bp);
 			goto done;
 		}
 	}
@@ -315,7 +315,7 @@ done:
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_WRITE;
 	DEV_STRATEGY(bp, 1);
-	error = biowait(bp);
+	error = bufwait(bp);
 #endif
 	bp->b_flags |= B_INVAL | B_AGE;
 	brelse(bp);
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 0d63747..13e4387 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -189,7 +189,7 @@ reread_mbr:
 	bp->b_bcount = lp->d_secsize;
 	bp->b_iocmd = BIO_READ;
 	DEV_STRATEGY(bp, 1);
-	if (biowait(bp) != 0) {
+	if (bufwait(bp) != 0) {
 		diskerr(&bp->b_io, "reading primary partition table: error",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
 		printf("\n");
@@ -405,7 +405,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
 	bp->b_bcount = lp->d_secsize;
 	bp->b_iocmd = BIO_READ;
 	DEV_STRATEGY(bp, 1);
-	if (biowait(bp) != 0) {
+	if (bufwait(bp) != 0) {
 		diskerr(&bp->b_io, "reading extended partition table: error",
 		    LOG_PRINTF, 0, (struct disklabel *)NULL);
 		printf("\n");
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 0b8c46a..7e99d18 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -473,7 +473,7 @@ bread(struct vnode * vp, daddr_t blkno, int size, struct ucred * cred,
 		}
 		vfs_busy_pages(bp, 0);
 		VOP_STRATEGY(vp, bp);
-		return (biowait(bp));
+		return (bufwait(bp));
 	}
 	return (0);
 }
@@ -538,7 +538,7 @@ breadn(struct vnode * vp, daddr_t blkno, int size,
 	}
 
 	if (readwait) {
-		rv = biowait(bp);
+		rv = bufwait(bp);
 	}
 	return (rv);
 }
@@ -647,7 +647,7 @@ bwrite(struct buf * bp)
 	BUF_STRATEGY(bp);
 
 	if ((oldflags & B_ASYNC) == 0) {
-		int rtval = biowait(bp);
+		int rtval = bufwait(bp);
 		brelse(bp);
 		return (rtval);
 	}
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index a19367a..caf35c4 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -292,7 +292,7 @@ single_block_read:
 		}
 	}
 	if (reqbp)
-		return (biowait(reqbp));
+		return (bufwait(reqbp));
 	else
 		return (error);
 }