26c26
< * $FreeBSD: head/sys/dev/ida/ida_disk.c 59213 2000-04-13 23:42:55Z jlemon $
---
> * $FreeBSD: head/sys/dev/ida/ida_disk.c 59249 2000-04-15 05:54:02Z phk $
152c152
< idstrategy(struct buf *bp)
---
> idstrategy(struct bio *bp)
157c157
< drv = idgetsoftc(bp->b_dev);
---
> drv = idgetsoftc(bp->bio_dev);
159c159
< bp->b_error = EINVAL;
---
> bp->bio_error = EINVAL;
166,167c166,167
< if (drv->flags & DRV_WRITEPROT && (bp->b_iocmd == BIO_WRITE)) {
< bp->b_error = EROFS;
---
> if (drv->flags & DRV_WRITEPROT && (bp->bio_cmd == BIO_WRITE)) {
> bp->bio_error = EROFS;
174c174
< if (bp->b_bcount == 0)
---
> if (bp->bio_bcount == 0)
177c177
< bp->b_driver1 = drv;
---
> bp->bio_driver1 = drv;
185c185
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_flags |= BIO_ERROR;
191c191
< bp->b_resid = bp->b_bcount;
---
> bp->bio_resid = bp->bio_bcount;
197c197
< id_intr(struct buf *bp)
---
> id_intr(struct bio *bp)
199c199
< struct id_softc *drv = (struct id_softc *)bp->b_driver1;
---
> struct id_softc *drv = (struct id_softc *)bp->bio_driver1;
201,202c201,202
< if (bp->b_ioflags & BIO_ERROR)
< bp->b_error = EIO;
---
> if (bp->bio_flags & BIO_ERROR)
> bp->bio_error = EIO;
204c204
< bp->b_resid = 0;
---
> bp->bio_resid = 0;
206c206
< devstat_end_transaction_buf(&drv->stats, bp);
---
> devstat_end_transaction_bio(&drv->stats, bp);