43c43
< * $FreeBSD: head/sys/dev/mcd/mcd.c 58934 2000-04-02 15:24:56Z phk $
---
> * $FreeBSD: head/sys/dev/mcd/mcd.c 59249 2000-04-15 05:54:02Z phk $
119c119
< struct buf *bp;
---
> struct bio *bp;
144c144
< struct buf_queue_head head; /* head of buf queue */
---
> struct bio_queue_head head; /* head of bio queue */
253c253
< bufq_init(&cd->head);
---
> bioq_init(&cd->head);
388c388
< mcdstrategy(struct buf *bp)
---
> mcdstrategy(struct bio *bp)
393c393
< int unit = mcd_unit(bp->b_dev);
---
> int unit = mcd_unit(bp->bio_dev);
399,400c399,400
< bp,unit,bp->b_blkno,bp->b_bcount);*/
< if (unit >= NMCD || bp->b_blkno < 0) {
---
> bp,unit,bp->bio_blkno,bp->bio_bcount);*/
> if (unit >= NMCD || bp->bio_blkno < 0) {
402c402
< unit, (long)bp->b_blkno, bp->b_bcount);
---
> unit, (long)bp->bio_blkno, bp->bio_bcount);
404,405c404,405
< bp->b_error = EINVAL;
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_error = EINVAL;
> bp->bio_flags |= BIO_ERROR;
412c412
< bp->b_error = EIO;
---
> bp->bio_error = EIO;
417,418c417,418
< if (!(bp->b_iocmd == BIO_READ)) {
< bp->b_error = EROFS;
---
> if (!(bp->bio_cmd == BIO_READ)) {
> bp->bio_error = EROFS;
423c423
< if (bp->b_bcount == 0)
---
> if (bp->bio_bcount == 0)
427c427
< if (mcd_part(bp->b_dev) != RAW_PART) {
---
> if (mcd_part(bp->bio_dev) != RAW_PART) {
429c429
< bp->b_error = EIO;
---
> bp->bio_error = EIO;
437,438c437,438
< bp->b_pblkno = bp->b_blkno;
< bp->b_resid = 0;
---
> bp->bio_pblkno = bp->bio_blkno;
> bp->bio_resid = 0;
443c443
< bufqdisksort(&cd->head, bp);
---
> bioqdisksort(&cd->head, bp);
451c451
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_flags |= BIO_ERROR;
453c453
< bp->b_resid = bp->b_bcount;
---
> bp->bio_resid = bp->bio_bcount;
462c462
< struct buf *bp;
---
> struct bio *bp;
470c470
< bp = bufq_first(&cd->head);
---
> bp = bioq_first(&cd->head);
474c474
< bufq_remove(&cd->head, bp);
---
> bioq_remove(&cd->head, bp);
488c488
< p = cd->dlabel.d_partitions + mcd_part(bp->b_dev);
---
> p = cd->dlabel.d_partitions + mcd_part(bp->bio_dev);
491c491
< if (cd->partflags[mcd_part(bp->b_dev)] & MCDREADRAW)
---
> if (cd->partflags[mcd_part(bp->bio_dev)] & MCDREADRAW)
996c996
< struct buf *bp = mbx->bp;
---
> struct bio *bp = mbx->bp;
1089c1089
< mbx->nblk = (bp->b_bcount + (mbx->sz-1)) / mbx->sz;
---
> mbx->nblk = (bp->bio_bcount + (mbx->sz-1)) / mbx->sz;
1093c1093
< blknum = (bp->b_blkno / (mbx->sz/DEV_BSIZE))
---
> blknum = (bp->bio_blkno / (mbx->sz/DEV_BSIZE))
1134c1134
< addr = bp->b_data + mbx->skip;
---
> addr = bp->bio_data + mbx->skip;
1156c1156
< bp->b_resid = 0;
---
> bp->bio_resid = 0;
1187,1188c1187,1188
< bp->b_ioflags |= BIO_ERROR;
< bp->b_resid = bp->b_bcount;
---
> bp->bio_flags |= BIO_ERROR;
> bp->bio_resid = bp->bio_bcount;