Index: sbin/vinum/list.c
===================================================================
RCS file: /home/repos/DragonFly-CVS/src/sbin/vinum/list.c,v
retrieving revision 1.10
diff -u -r1.10 list.c
--- sbin/vinum/list.c	18 Jun 2007 05:13:41 -0000	1.10
+++ sbin/vinum/list.c	8 Jul 2008 20:50:37 -0000
@@ -899,11 +899,11 @@
 		printf("%s %dVS %s %p\t%d.%-6d 0x%-9x\t%ld\n",
 		    timetext(&rq.timestamp),
 		    rq.type,
-		    rq.info.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
+		    rq.info.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
 		    rq.devmajor,
 		    rq.devminor,
-		    rq.info.b.b_blkno,
+		    rq.info.bio.bio_offset,
 		    rq.info.b.b_bcount);
 		break;
 
@@ -912,22 +912,22 @@
 		printf("%s %dLR %s %p\t%d.%-6d 0x%-9x\t%ld\n",
 		    timetext(&rq.timestamp),
 		    rq.type,
-		    rq.info.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
+		    rq.info.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
 		    rq.devmajor,
 		    rq.devminor,
-		    rq.info.b.b_blkno,
+		    rq.info.bio.bio_offset,
 		    rq.info.b.b_bcount);
 		break;
 
 	    case loginfo_rqe:				    /* user RQE */
 		printf("%s 3RQ %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n",
 		    timetext(&rq.timestamp),
-		    rq.info.rqe.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
+		    rq.info.rqe.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
 		    rq.devmajor,
 		    rq.devminor,
-		    rq.info.rqe.b.b_blkno,
+		    rq.info.rqe.b.b_bio1.bio_offset,
 		    rq.info.rqe.b.b_bcount,
 		    rq.info.rqe.sdno,
 		    rq.info.rqe.sdoffset,
@@ -938,11 +938,11 @@
 	    case loginfo_iodone:			    /* iodone called */
 		printf("%s 4DN %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n",
 		    timetext(&rq.timestamp),
-		    rq.info.rqe.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
+		    rq.info.rqe.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
 		    rq.devmajor,
 		    rq.devminor,
-		    rq.info.rqe.b.b_blkno,
+		    rq.info.rqe.b.b_bio1.bio_offset,
 		    rq.info.rqe.b.b_bcount,
 		    rq.info.rqe.sdno,
 		    rq.info.rqe.sdoffset,
@@ -953,11 +953,11 @@
 	    case loginfo_raid5_data:			    /* RAID-5 write data block */
 		printf("%s 5RD %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n",
 		    timetext(&rq.timestamp),
-		    rq.info.rqe.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
+		    rq.info.rqe.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
 		    rq.devmajor,
 		    rq.devminor,
-		    rq.info.rqe.b.b_blkno,
+		    rq.info.rqe.b.b_bio1.bio_offset,
 		    rq.info.rqe.b.b_bcount,
 		    rq.info.rqe.sdno,
 		    rq.info.rqe.sdoffset,
@@ -968,11 +968,11 @@
 	    case loginfo_raid5_parity:			    /* RAID-5 write parity block */
 		printf("%s 6RP %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n",
 		    timetext(&rq.timestamp),
-		    rq.info.rqe.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
+		    rq.info.rqe.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
 		    rq.devmajor,
 		    rq.devminor,
-		    rq.info.rqe.b.b_blkno,
+		    rq.info.rqe.b.b_bio1.bio_offset,
 		    rq.info.rqe.b.b_bcount,
 		    rq.info.rqe.sdno,
 		    rq.info.rqe.sdoffset,
@@ -984,9 +984,9 @@
 		printf("%s %dVS %s %p\t\t  0x%-9x\t%ld\t%d\n",
 		    timetext(&rq.timestamp),
 		    rq.type,
-		    rq.info.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
-		    rq.info.b.b_blkno,
+		    rq.info.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
+		    rq.info.bio.bio_offset,
 		    rq.info.b.b_bcount,
 		    rq.devminor);
 		break;
@@ -995,9 +995,9 @@
 		printf("%s %dSD %s %p\t\t  0x%-9x\t%ld\t%d\n",
 		    timetext(&rq.timestamp),
 		    rq.type,
-		    rq.info.b.b_flags & B_READ ? "Read " : "Write",
-		    rq.bp,
-		    rq.info.b.b_blkno,
+		    rq.info.b.b_flags & BUF_CMD_READ ? "Read " : "Write",
+		    rq.bio,
+		    rq.info.bio.bio_offset,
 		    rq.info.b.b_bcount,
 		    rq.devminor);
 		break;
@@ -1005,21 +1005,21 @@
 	    case loginfo_lockwait:
 		printf("%s Lockwait  %p\t  0x%x\n",
 		    timetext(&rq.timestamp),
-		    rq.bp,
+		    rq.bio,
 		    rq.info.lockinfo.stripe);
 		break;
 
 	    case loginfo_lock:
 		printf("%s Lock      %p\t  0x%x\n",
 		    timetext(&rq.timestamp),
-		    rq.bp,
+		    rq.bio,
 		    rq.info.lockinfo.stripe);
 		break;
 
 	    case loginfo_unlock:
 		printf("%s Unlock\t  %p\t  0x%x\n",
 		    timetext(&rq.timestamp),
-		    rq.bp,
+		    rq.bio,
 		    rq.info.lockinfo.stripe);
 		break;
 	    }