From a246e10f55686681d4b6bd4dba5ca661b4e34bb0 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 20 Mar 2000 10:44:49 +0000 Subject: 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. --- sys/dev/ida/ida.c | 2 +- sys/dev/ida/ida_disk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/ida') diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index c53f2c9..c9e924e 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -404,7 +404,7 @@ ida_construct_qcb(struct ida_softc *ida) hwqcb->req.blkno = bp->b_pblkno; hwqcb->req.bcount = howmany(bp->b_bcount, DEV_BSIZE); - hwqcb->req.command = bp->b_flags & B_READ ? CMD_READ : CMD_WRITE; + hwqcb->req.command = bp->b_iocmd == BIO_READ ? CMD_READ : CMD_WRITE; STAILQ_INSERT_TAIL(&ida->qcb_queue, qcb, link.stqe); } diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index c0bf915..ee1c157 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -163,7 +163,7 @@ idstrategy(struct buf *bp) /* * software write protect check */ - if (drv->flags & DRV_WRITEPROT && (bp->b_flags & B_READ) == 0) { + if (drv->flags & DRV_WRITEPROT && (bp->b_iocmd == BIO_WRITE)) { bp->b_error = EROFS; goto bad; } -- cgit v1.1