Complete the bio/buf divorce for all code below devfs::strategy

Exceptions:
        Vinum untouched.  This means that it cannot be compiled.
        Greg Lehey is on the case.

        CCD not converted yet, casts to struct buf (still safe)

        atapi-cd casts to struct buf to examine B_PHYS

1 files changed, 4 insertions, 4 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);
 }
 
 /*