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.

6 files changed, 16 insertions, 16 deletions

diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 1510bf1..f5b81e8 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -109,7 +109,7 @@ physio(dev_t dev, struct uio *uio, int ioflag)
 				vmapbuf(bp);
 			}
 
-			BUF_STRATEGY(bp, 0);
+			DEV_STRATEGY(bp, 0);
 			spl = splbio();
 			while ((bp->b_flags & B_DONE) == 0)
 				tsleep((caddr_t)bp, PRIBIO, "physstr", 0);
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index ff72629..20209d1 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -301,7 +301,7 @@ writedisklabel(dev, lp)
 #ifdef __alpha__
 			alpha_fix_srm_checksum(bp);
 #endif
-			BUF_STRATEGY(bp, 1);
+			DEV_STRATEGY(bp, 1);
 			error = biowait(bp);
 			goto done;
 		}
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 10b1eab..3930d54 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1032,7 +1032,7 @@ aio_qphysio(struct proc *p, struct aiocblist *aiocbe)
 	splx(s);
 	
 	/* Perform transfer. */
-	BUF_STRATEGY(bp, 0);
+	DEV_STRATEGY(bp, 0);
 
 	s = splbio();
 	
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index da67cf2..ad38dc2 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -678,7 +678,7 @@ bwrite(struct buf * bp)
 	splx(s);
 	if (oldflags & B_ASYNC)
 		BUF_KERNPROC(bp);
-	VOP_STRATEGY(bp->b_vp, bp);
+	BUF_STRATEGY(bp);
 
 	if ((oldflags & B_ASYNC) == 0) {
 		int rtval = biowait(bp);
@@ -886,7 +886,7 @@ void
 bawrite(struct buf * bp)
 {
 	bp->b_flags |= B_ASYNC;
-	(void) VOP_BWRITE(bp->b_vp, bp);
+	(void) BUF_WRITE(bp);
 }
 
 /*
@@ -901,7 +901,7 @@ int
 bowrite(struct buf * bp)
 {
 	bp->b_flags |= B_ORDERED | B_ASYNC;
-	return (VOP_BWRITE(bp->b_vp, bp));
+	return (BUF_WRITE(bp));
 }
 
 /*
@@ -1426,7 +1426,7 @@ vfs_bio_awrite(struct buf * bp)
 	 * XXX returns b_bufsize instead of b_bcount for nwritten?
 	 */
 	nwritten = bp->b_bufsize;
-	(void) VOP_BWRITE(bp->b_vp, bp);
+	(void) BUF_WRITE(bp);
 
 	return nwritten;
 }
@@ -2164,7 +2164,7 @@ loop:
 			    (size > bp->b_kvasize)) {
 				if (bp->b_flags & B_DELWRI) {
 					bp->b_flags |= B_NOCACHE;
-					VOP_BWRITE(bp->b_vp, bp);
+					BUF_WRITE(bp);
 				} else {
 					if ((bp->b_flags & B_VMIO) &&
 					   (LIST_FIRST(&bp->b_dep) == NULL)) {
@@ -2172,7 +2172,7 @@ loop:
 						brelse(bp);
 					} else {
 						bp->b_flags |= B_NOCACHE;
-						VOP_BWRITE(bp->b_vp, bp);
+						BUF_WRITE(bp);
 					}
 				}
 				goto loop;
@@ -2209,7 +2209,7 @@ loop:
 		 */
 
 		if ((bp->b_flags & (B_CACHE|B_DELWRI)) == B_DELWRI) {
-			VOP_BWRITE(bp->b_vp, bp);
+			BUF_WRITE(bp);
 			goto loop;
 		}
 
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index a528d87..273829b 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -702,11 +702,11 @@ vinvalbuf(vp, flags, cred, p, slpflag, slptimeo)
 					} else {
 						bremfree(bp);
 						bp->b_flags |= B_ASYNC;
-						VOP_BWRITE(bp->b_vp, bp);
+						BUF_WRITE(bp);
 					}
 				} else {
 					bremfree(bp);
-					(void) VOP_BWRITE(bp->b_vp, bp);
+					(void) BUF_WRITE(bp);
 				}
 				break;
 			}
@@ -828,7 +828,7 @@ restartsync:
 					} else {
 						bp->b_flags &= ~B_ASYNC;
 					}
-					VOP_BWRITE(bp->b_vp, bp);
+					BUF_WRITE(bp);
 				}
 				goto restartsync;
 			}
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index a528d87..273829b 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -702,11 +702,11 @@ vinvalbuf(vp, flags, cred, p, slpflag, slptimeo)
 					} else {
 						bremfree(bp);
 						bp->b_flags |= B_ASYNC;
-						VOP_BWRITE(bp->b_vp, bp);
+						BUF_WRITE(bp);
 					}
 				} else {
 					bremfree(bp);
-					(void) VOP_BWRITE(bp->b_vp, bp);
+					(void) BUF_WRITE(bp);
 				}
 				break;
 			}
@@ -828,7 +828,7 @@ restartsync:
 					} else {
 						bp->b_flags &= ~B_ASYNC;
 					}
-					VOP_BWRITE(bp->b_vp, bp);
+					BUF_WRITE(bp);
 				}
 				goto restartsync;
 			}