summaryrefslogtreecommitdiffstats
path: root/sys/cam/scsi/scsi_cd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/cam/scsi/scsi_cd.c')
-rw-r--r--sys/cam/scsi/scsi_cd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 11df7be..3985570 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -378,7 +378,7 @@ cdoninvalidate(struct cam_periph *periph)
bufq_remove(&softc->buf_queue, q_bp);
q_bp->b_resid = q_bp->b_bcount;
q_bp->b_error = ENXIO;
- q_bp->b_flags |= B_ERROR;
+ q_bp->b_ioflags |= BIO_ERROR;
biodone(q_bp);
}
splx(s);
@@ -1381,7 +1381,7 @@ cdstrategy(struct buf *bp)
return;
bad:
- bp->b_flags |= B_ERROR;
+ bp->b_ioflags |= BIO_ERROR;
/*
* Correctly set the buf to indicate a completed xfer
*/
@@ -1429,7 +1429,7 @@ cdstart(struct cam_periph *periph, union ccb *start_ccb)
scsi_read_write(&start_ccb->csio,
/*retries*/4,
/* cbfcnp */ cddone,
- (bp->b_flags & B_ORDERED) != 0 ?
+ (bp->b_ioflags & BIO_ORDERED) != 0 ?
MSG_ORDERED_Q_TAG :
MSG_SIMPLE_Q_TAG,
/* read */bp->b_iocmd == BIO_READ,
@@ -1551,13 +1551,13 @@ cddone(struct cam_periph *periph, union ccb *done_ccb)
bufq_remove(&softc->buf_queue, q_bp);
q_bp->b_resid = q_bp->b_bcount;
q_bp->b_error = EIO;
- q_bp->b_flags |= B_ERROR;
+ q_bp->b_ioflags |= BIO_ERROR;
biodone(q_bp);
}
splx(s);
bp->b_resid = bp->b_bcount;
bp->b_error = error;
- bp->b_flags |= B_ERROR;
+ bp->b_ioflags |= BIO_ERROR;
cam_release_devq(done_ccb->ccb_h.path,
/*relsim_flags*/0,
/*reduction*/0,
@@ -1569,7 +1569,7 @@ cddone(struct cam_periph *periph, union ccb *done_ccb)
bp->b_error = 0;
if (bp->b_resid != 0) {
/* Short transfer ??? */
- bp->b_flags |= B_ERROR;
+ bp->b_ioflags |= BIO_ERROR;
}
}
OpenPOWER on IntegriCloud