Remove B_READ, B_WRITE and B_FREEBUF and replace them with a new

field in struct buf: b_iocmd.  The b_iocmd is enforced to have
exactly one bit set.

B_WRITE was bogusly defined as zero giving rise to obvious coding
mistakes.

Also eliminate the redundant struct buf flag B_CALL, it can just
as efficiently be done by comparing b_iodone to NULL.

Should you get a panic or drop into the debugger, complaining about
"b_iocmd", don't continue.  It is likely to write on your disk
where it should have been reading.

This change is a step in the direction towards a stackable BIO capability.

A lot of this patch were machine generated (Thanks to style(9) compliance!)

Vinum users:  Greg has not had time to test this yet, be careful.

1 files changed, 6 insertions, 7 deletions

diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 2b6445f..080912b 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -556,7 +556,7 @@ cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo)
 		}
 
 		if (dirs[i] & CAM_DIR_OUT) {
-			flags[i] = B_WRITE;
+			flags[i] = BIO_WRITE;
 			if (!useracc(*data_ptrs[i], lengths[i], 
 				     VM_PROT_READ)) {
 				printf("cam_periph_mapmem: error, "
@@ -568,12 +568,8 @@ cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo)
 			}
 		}
 
-		/*
-		 * XXX this check is really bogus, since B_WRITE currently
-		 * is all 0's, and so it is "set" all the time.
-		 */
 		if (dirs[i] & CAM_DIR_IN) {
-			flags[i] |= B_READ;
+			flags[i] = BIO_READ;
 			if (!useracc(*data_ptrs[i], lengths[i], 
 				     VM_PROT_WRITE)) {
 				printf("cam_periph_mapmem: error, "
@@ -610,7 +606,10 @@ cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo)
 		mapinfo->bp[i]->b_bufsize = lengths[i];
 
 		/* set the flags */
-		mapinfo->bp[i]->b_flags = flags[i] | B_PHYS;
+		mapinfo->bp[i]->b_flags = B_PHYS;
+
+		/* set the direction */
+		mapinfo->bp[i]->b_iocmd = flags[i];
 
 		/* map the buffer into kernel memory */
 		vmapbuf(mapinfo->bp[i]);