Rename the existing BUF_STRATEGY() to DEV_STRATEGY()

substitute BUF_WRITE(foo) for VOP_BWRITE(foo->b_vp, foo)

substitute BUF_STRATEGY(foo) for VOP_STRATEGY(foo->b_vp, foo)

This patch is machine generated except for the ccd.c and buf.h parts.

4 files changed, 7 insertions, 7 deletions

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 7653506..2b00c5b 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1133,7 +1133,7 @@ swap_pager_getpages(object, m, count, reqpage)
 	 */
 
 	BUF_KERNPROC(bp);
-	VOP_STRATEGY(bp->b_vp, bp);
+	BUF_STRATEGY(bp);
 
 	/*
 	 * wait for the page we want to complete.  PG_SWAPINPROG is always
@@ -1383,7 +1383,7 @@ swap_pager_putpages(object, m, count, sync, rtvals)
 		if (sync == FALSE) {
 			bp->b_iodone = swp_pager_async_iodone;
 			BUF_KERNPROC(bp);
-			VOP_STRATEGY(bp->b_vp, bp);
+			BUF_STRATEGY(bp);
 
 			for (j = 0; j < n; ++j)
 				rtvals[i+j] = VM_PAGER_PEND;
@@ -1397,7 +1397,7 @@ swap_pager_putpages(object, m, count, sync, rtvals)
 		 */
 
 		bp->b_iodone = swp_pager_sync_iodone;
-		VOP_STRATEGY(bp->b_vp, bp);
+		BUF_STRATEGY(bp);
 
 		/*
 		 * Wait for the sync I/O to complete, then update rtvals.
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index e3817c5..6ca7f12 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -567,7 +567,7 @@ flushchainbuf(struct buf *nbp)
 		if (nbp->b_iocmd == BIO_WRITE)
 			nbp->b_dirtyend = nbp->b_bcount;
 		BUF_KERNPROC(nbp);
-		VOP_STRATEGY(nbp->b_vp, nbp);
+		BUF_STRATEGY(nbp);
 	} else {
 		biodone(nbp);
 	}
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 11ca203..5b2b514 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -150,7 +150,7 @@ swapdev_strategy(ap)
 	}
 	pbreassignbuf(bp, sp->sw_vp);
 	splx(s);
-	VOP_STRATEGY(bp->b_vp, bp);
+	BUF_STRATEGY(bp);
 	return 0;
 }
 
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 279f47c..628d598 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -425,7 +425,7 @@ vnode_pager_input_smlfs(object, m)
 			bp->b_bufsize = bsize;
 
 			/* do the input */
-			VOP_STRATEGY(bp->b_vp, bp);
+			BUF_STRATEGY(bp);
 
 			/* we definitely need to be at splvm here */
 
@@ -746,7 +746,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
 	cnt.v_vnodepgsin += count;
 
 	/* do the input */
-	VOP_STRATEGY(bp->b_vp, bp);
+	BUF_STRATEGY(bp);
 
 	s = splvm();
 	/* we definitely need to be at splvm here */