3 files changed, 17 insertions, 17 deletions

diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index d1e6047..3affa85 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -164,10 +164,10 @@ static int
 mfs_strategy(ap)
 	struct vop_strategy_args /* {
 		struct vnode *a_vp;
-		struct buf *a_bp;
+		struct bio *a_bp;
 	} */ *ap;
 {
-	register struct buf *bp = ap->a_bp;
+	register struct buf *bp = (struct buf *)ap->a_bp;
 	register struct mfsnode *mfsp;
 	struct vnode *vp;
 	struct proc *p = curproc;		/* XXX */
@@ -198,7 +198,7 @@ mfs_strategy(ap)
 			bcopy(base, bp->b_data, bp->b_bcount);
 		else
 			bcopy(bp->b_data, base, bp->b_bcount);
-		biodone(bp);
+		bufdone(bp);
 	} else if (mfsp->mfs_pid == p->p_pid) {
 		/*
 		 * VOP to self
@@ -277,7 +277,7 @@ mfs_doio(bp, mfsp)
 	}
 	if (bp->b_error)
 		bp->b_ioflags |= BIO_ERROR;
-	biodone(bp);
+	bufdone(bp);
 }
 
 /*
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 551652f..8a1fc0b 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -453,14 +453,14 @@ hp0g: hard error reading fsbn 12345 of 12344-12347 (hp0 bn %d cn %d tn %d sn %d)
  */
 void
 diskerr(bp, what, pri, blkdone, lp)
-	register struct buf *bp;
+	struct bio *bp;
 	char *what;
 	int pri, blkdone;
 	register struct disklabel *lp;
 {
-	int unit = dkunit(bp->b_dev);
-	int slice = dkslice(bp->b_dev);
-	int part = dkpart(bp->b_dev);
+	int unit = dkunit(bp->bio_dev);
+	int slice = dkslice(bp->bio_dev);
+	int part = dkpart(bp->bio_dev);
 	register int (*pr) __P((const char *, ...));
 	char partname[2];
 	char *sname;
@@ -471,21 +471,21 @@ diskerr(bp, what, pri, blkdone, lp)
 		pr = addlog;
 	} else
 		pr = printf;
-	sname = dsname(bp->b_dev, unit, slice, part, partname);
+	sname = dsname(bp->bio_dev, unit, slice, part, partname);
 	(*pr)("%s%s: %s %sing fsbn ", sname, partname, what,
-	      bp->b_iocmd == BIO_READ ? "read" : "writ");
-	sn = bp->b_blkno;
-	if (bp->b_bcount <= DEV_BSIZE)
+	      bp->bio_cmd == BIO_READ ? "read" : "writ");
+	sn = bp->bio_blkno;
+	if (bp->bio_bcount <= DEV_BSIZE)
 		(*pr)("%ld", (long)sn);
 	else {
 		if (blkdone >= 0) {
 			sn += blkdone;
 			(*pr)("%ld of ", (long)sn);
 		}
-		(*pr)("%ld-%ld", (long)bp->b_blkno,
-		    (long)(bp->b_blkno + (bp->b_bcount - 1) / DEV_BSIZE));
+		(*pr)("%ld-%ld", (long)bp->bio_blkno,
+		    (long)(bp->bio_blkno + (bp->bio_bcount - 1) / DEV_BSIZE));
 	}
-	if (lp && (blkdone >= 0 || bp->b_bcount <= lp->d_secsize)) {
+	if (lp && (blkdone >= 0 || bp->bio_bcount <= lp->d_secsize)) {
 #ifdef tahoe
 		sn *= DEV_BSIZE / lp->d_secsize;		/* XXX */
 #endif
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 7ab8429..f399511 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1766,14 +1766,14 @@ ufs_strategy(ap)
 		if (error) {
 			bp->b_error = error;
 			bp->b_ioflags |= BIO_ERROR;
-			biodone(bp);
+			bufdone(bp);
 			return (error);
 		}
 		if ((long)bp->b_blkno == -1)
 			vfs_bio_clrbuf(bp);
 	}
 	if ((long)bp->b_blkno == -1) {
-		biodone(bp);
+		bufdone(bp);
 		return (0);
 	}
 	vp = ip->i_devvp;