Move B_ERROR flag to b_ioflags and call it BIO_ERROR.

(Much of this done by script)

Move B_ORDERED flag to b_ioflags and call it BIO_ORDERED.

Move b_pblkno and b_iodone_chain to struct bio while we transition, they
will be obsoleted once bio structs chain/stack.

Add bio_queue field for struct bio aware disksort.

Address a lot of stylistic issues brought up by bde.

6 files changed, 10 insertions, 10 deletions

diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 65ad938..355a6a53 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -758,7 +758,7 @@ cd9660_strategy(ap)
 		if ((error =
 		    VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL, NULL))) {
 			bp->b_error = error;
-			bp->b_flags |= B_ERROR;
+			bp->b_ioflags |= BIO_ERROR;
 			biodone(bp);
 			return (error);
 		}
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index e8cb76a..09668b1 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -746,7 +746,7 @@ hpfs_strategy(ap)
 		if (error) {
 			printf("hpfs_strategy: VOP_BMAP FAILED %d\n", error);
 			bp->b_error = error;
-			bp->b_flags |= B_ERROR;
+			bp->b_ioflags |= BIO_ERROR;
 			biodone(bp);
 			return (error);
 		}
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 5ce4990..ad0852e 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1838,7 +1838,7 @@ msdosfs_strategy(ap)
 		error = pcbmap(dep, bp->b_lblkno, &bp->b_blkno, 0, 0);
 		if (error) {
 			bp->b_error = error;
-			bp->b_flags |= B_ERROR;
+			bp->b_ioflags |= BIO_ERROR;
 			biodone(bp);
 			return (error);
 		}
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index a47cf56f..fc8f04e 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -364,7 +364,7 @@ ntfs_strategy(ap)
 			if (error) {
 				printf("ntfs_strategy: ntfs_readattr failed\n");
 				bp->b_error = error;
-				bp->b_flags |= B_ERROR;
+				bp->b_ioflags |= BIO_ERROR;
 			}
 
 			bzero(bp->b_data + toread, bp->b_bcount - toread);
@@ -376,7 +376,7 @@ ntfs_strategy(ap)
 		if (ntfs_cntob(bp->b_blkno) + bp->b_bcount >= fp->f_size) {
 			printf("ntfs_strategy: CAN'T EXTEND FILE\n");
 			bp->b_error = error = EFBIG;
-			bp->b_flags |= B_ERROR;
+			bp->b_ioflags |= BIO_ERROR;
 		} else {
 			towrite = min(bp->b_bcount,
 				fp->f_size-ntfs_cntob(bp->b_blkno));
@@ -390,7 +390,7 @@ ntfs_strategy(ap)
 			if (error) {
 				printf("ntfs_strategy: ntfs_writeattr fail\n");
 				bp->b_error = error;
-				bp->b_flags |= B_ERROR;
+				bp->b_ioflags |= BIO_ERROR;
 			}
 		}
 	}
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 6f7a6c8..ab24a29 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -311,7 +311,7 @@ nwfs_doio(bp, cr, p)
 		break;
 	    };
 	    if (error) {
-		bp->b_flags |= B_ERROR;
+		bp->b_ioflags |= BIO_ERROR;
 		bp->b_error = error;
 	    }
 	} else { /* write */
@@ -330,7 +330,7 @@ nwfs_doio(bp, cr, p)
 		/*
 		 * For an interrupted write, the buffer is still valid
 		 * and the write hasn't been pushed to the server yet,
-		 * so we can't set B_ERROR and report the interruption
+		 * so we can't set BIO_ERROR and report the interruption
 		 * by setting B_EINTR. For the B_ASYNC case, B_EINTR
 		 * is not relevant, so the rpc attempt is essentially
 		 * a noop.  For the case of a V3 write rpc not being
@@ -357,7 +357,7 @@ nwfs_doio(bp, cr, p)
 			splx(s);
 	    	} else {
 			if (error) {
-				bp->b_flags |= B_ERROR;
+				bp->b_ioflags |= BIO_ERROR;
 				bp->b_error /*= np->n_error */= error;
 /*				np->n_flag |= NWRITEERR;*/
 			}
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 0eb4d54a..784142d 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -687,7 +687,7 @@ spec_getpages(ap)
 
 	splx(s);
 
-	if ((bp->b_flags & B_ERROR) != 0) {
+	if ((bp->b_ioflags & BIO_ERROR) != 0) {
 		if (bp->b_error)
 			error = bp->b_error;
 		else