6 files changed, 13 insertions, 19 deletions

diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index fe45b6edc046..dcab05efa5bb 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -890,10 +890,8 @@ ccdstart(cs, bp)
 			if (cbp[0]->cb_buf.b_iocmd == BIO_WRITE) {
 				cbp[0]->cb_buf.b_vp->v_numoutput++;
 				cbp[1]->cb_buf.b_vp->v_numoutput++;
-				VOP_STRATEGY(cbp[0]->cb_buf.b_vp, 
-				    &cbp[0]->cb_buf);
-				VOP_STRATEGY(cbp[1]->cb_buf.b_vp, 
-				    &cbp[1]->cb_buf);
+				BUF_STRATEGY(&cbp[0]->cb_buf);
+				BUF_STRATEGY(&cbp[1]->cb_buf);
 			} else {
 				int pick = cs->sc_pick;
 				daddr_t range = cs->sc_size / 16;
@@ -904,8 +902,7 @@ ccdstart(cs, bp)
 					cs->sc_pick = pick = 1 - pick;
 				}
 				cs->sc_blk[pick] = bn + btodb(rcount);
-				VOP_STRATEGY(cbp[pick]->cb_buf.b_vp, 
-				    &cbp[pick]->cb_buf);
+				BUF_STRATEGY(&cbp[pick]->cb_buf);
 			}
 		} else {
 			/*
@@ -913,7 +910,7 @@ ccdstart(cs, bp)
 			 */
 			if (cbp[0]->cb_buf.b_iocmd == BIO_WRITE)
 				cbp[0]->cb_buf.b_vp->v_numoutput++;
-			VOP_STRATEGY(cbp[0]->cb_buf.b_vp, &cbp[0]->cb_buf);
+			BUF_STRATEGY(&cbp[0]->cb_buf);
 		}
 		bn += btodb(rcount);
 		addr += rcount;
@@ -1210,10 +1207,7 @@ ccdiodone(ibp)
 				if (cbp->cb_buf.b_flags & B_ERROR) {
 					cbp->cb_mirror->cb_pflags |= 
 					    CCDPF_MIRROR_DONE;
-					VOP_STRATEGY(
-					    cbp->cb_mirror->cb_buf.b_vp, 
-					    &cbp->cb_mirror->cb_buf
-					);
+					BUF_STRATEGY(&cbp->cb_mirror->cb_buf);
 					putccdbuf(cbp);
 					splx(s);
 					return;
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 4048c7fa4a7d..5f29e052e364 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -2241,7 +2241,7 @@ fdformat(dev, finfo, p)
 
 	/* now do the format */
 	bp->b_dev = dev;
-	BUF_STRATEGY(bp, 0);
+	DEV_STRATEGY(bp, 0);
 
 	/* ...and wait for it to complete */
 	s = splbio();
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 3ac54d280e45..9a04a4490374 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -205,7 +205,7 @@ recover_io(struct request *rq)
      *
      * Negotiate with phk to get it fixed.
      */
-    BUF_STRATEGY(rq->bp, 0);				    /* reissue the command */
+    DEV_STRATEGY(rq->bp, 0);				    /* reissue the command */
 }
 
 /* Functions called to interface with the daemon */
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 8a234621e033..e47098fc5a7c 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -374,7 +374,7 @@ complete_raid5_write(struct rqelement *rqe)
 		    if (debug & DEBUG_LASTREQS)
 			logrq(loginfo_raid5_data, (union rqinfou) rqe, bp);
 #endif
-		    BUF_STRATEGY(&rqe->b, 0);
+		    DEV_STRATEGY(&rqe->b, 0);
 		}
 	    }
 	}
@@ -412,5 +412,5 @@ complete_raid5_write(struct rqelement *rqe)
     if (debug & DEBUG_LASTREQS)
 	logrq(loginfo_raid5_parity, (union rqinfou) rqe, bp);
 #endif
-    BUF_STRATEGY(&rqe->b, 0);
+    DEV_STRATEGY(&rqe->b, 0);
 }
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 8913d6651782..74a3053d814a 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -304,7 +304,7 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag)
 	bp->b_saveaddr = bp->b_data;
 	bp->b_data = buf;
 	bp->b_bcount = len;
-	BUF_STRATEGY(bp, 0);				    /* initiate the transfer */
+	DEV_STRATEGY(bp, 0);				    /* initiate the transfer */
 	error = biowait(bp);
 	bp->b_data = bp->b_saveaddr;
 	bp->b_flags |= B_INVAL | B_AGE;
@@ -764,7 +764,7 @@ write_volume_label(int volno)
      *
      * Negotiate with phk to get it fixed.
      */
-    BUF_STRATEGY(bp, 0);
+    DEV_STRATEGY(bp, 0);
     error = biowait(bp);
     bp->b_flags |= B_INVAL | B_AGE;
     bp->b_flags &= ~B_ERROR;
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 98c78921bd7d..3e86d7473efd 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -419,7 +419,7 @@ launch_requests(struct request *rq, int reviveok)
 
 
 		/* fire off the request */
-		BUF_STRATEGY(&rqe->b, 0);
+		DEV_STRATEGY(&rqe->b, 0);
 	    }
 	}
     }
@@ -960,7 +960,7 @@ sdio(struct buf *bp)
     if (debug & DEBUG_LASTREQS)
 	logrq(loginfo_sdiol, (union rqinfou) &sbp->b, &sbp->b);
 #endif
-    BUF_STRATEGY(&sbp->b, 0);
+    DEV_STRATEGY(&sbp->b, 0);
     splx(s);
 }