5 files changed, 8 insertions, 8 deletions

diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 381cb8fd8018..a47cf56fc98d 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -345,7 +345,7 @@ ntfs_strategy(ap)
 	dprintf(("strategy: bcount: %d flags: 0x%lx\n", 
 		(u_int32_t)bp->b_bcount,bp->b_flags));
 
-	if (bp->b_flags & B_READ) {
+	if (bp->b_iocmd == BIO_READ) {
 		u_int32_t toread;
 
 		if (ntfs_cntob(bp->b_blkno) >= fp->f_size) {
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index d634cbc1dc26..6f7a6c8aadc8 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -275,7 +275,7 @@ nwfs_doio(bp, cr, p)
 	uiop->uio_iovcnt = 1;
 	uiop->uio_segflg = UIO_SYSSPACE;
 	uiop->uio_procp = p;
-	if (bp->b_flags & B_READ) {
+	if (bp->b_iocmd == BIO_READ) {
 	    io.iov_len = uiop->uio_resid = bp->b_bcount;
 	    io.iov_base = bp->b_data;
 	    uiop->uio_rw = UIO_READ;
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index 22df1b30016a..c8e8b670b760 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -812,7 +812,7 @@ static int nwfs_strategy (ap)
 		p = (struct proc *)0;
 	else
 		p = curproc;	/* XXX */
-	if (bp->b_flags & B_READ)
+	if (bp->b_iocmd == BIO_READ)
 		cr = bp->b_rcred;
 	else
 		cr = bp->b_wcred;
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index a9a711e1c859..f48c0c1265f8 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -407,7 +407,7 @@ spec_strategy(ap)
 	struct mount *mp;
 
 	bp = ap->a_bp;
-	if (((bp->b_flags & B_READ) == 0) &&
+	if ((bp->b_iocmd == BIO_WRITE) &&
 		(LIST_FIRST(&bp->b_dep)) != NULL && bioops.io_start)
 		(*bioops.io_start)(bp);
 
@@ -417,7 +417,7 @@ spec_strategy(ap)
 	 */
 	vp = ap->a_vp;
 	if (vn_isdisk(vp, NULL) && (mp = vp->v_specmountpoint) != NULL) {
-		if ((bp->b_flags & B_READ) == 0) {
+		if (bp->b_iocmd == BIO_WRITE) {
 			if (bp->b_lock.lk_lockholder == LK_KERNPROC)
 				mp->mnt_stat.f_asyncwrites++;
 			else
@@ -458,7 +458,7 @@ spec_freeblks(ap)
 	if ((bsw->d_flags & D_CANFREE) == 0)
 		return (0);
 	bp = geteblk(ap->a_length);
-	bp->b_flags |= B_FREEBUF;
+	bp->b_iocmd = BIO_DELETE;
 	bp->b_dev = ap->a_vp->v_rdev;
 	bp->b_blkno = ap->a_addr;
 	bp->b_offset = dbtob(ap->a_addr);
@@ -657,7 +657,7 @@ spec_getpages(ap)
 	pmap_qenter(kva, ap->a_m, pcount);
 
 	/* Build a minimal buffer header. */
-	bp->b_flags = B_READ | B_CALL;
+	bp->b_iocmd = BIO_READ;
 	bp->b_iodone = spec_getpages_iodone;
 
 	/* B_PHYS is not set, but it is nice to fill this in. */
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 03d41a01e0d8..38c190b84723 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -1923,7 +1923,7 @@ union_strategy(ap)
 #ifdef DIAGNOSTIC
 	if (othervp == NULLVP)
 		panic("union_strategy: nil vp");
-	if (((bp->b_flags & B_READ) == 0) &&
+	if ((bp->b_iocmd == BIO_WRITE) &&
 	    (othervp == LOWERVP(bp->b_vp)))
 		panic("union_strategy: writing to lowervp");
 #endif