27c27
< * $FreeBSD: head/sys/dev/mlx/mlx_disk.c 59136 2000-04-11 02:52:46Z msmith $
---
> * $FreeBSD: head/sys/dev/mlx/mlx_disk.c 59249 2000-04-15 05:54:02Z phk $
168c168
< mlxd_strategy(struct buf *bp)
---
> mlxd_strategy(struct bio *bp)
170c170
< struct mlxd_softc *sc = (struct mlxd_softc *)bp->b_dev->si_drv1;
---
> struct mlxd_softc *sc = (struct mlxd_softc *)bp->bio_dev->si_drv1;
176c176
< bp->b_error = EINVAL;
---
> bp->bio_error = EINVAL;
182c182
< bp->b_error = ENXIO;
---
> bp->bio_error = ENXIO;
187c187
< if (bp->b_bcount == 0)
---
> if (bp->bio_bcount == 0)
195c195
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_flags |= BIO_ERROR;
201c201
< bp->b_resid = bp->b_bcount;
---
> bp->bio_resid = bp->bio_bcount;
209,210c209,210
< struct buf *bp = (struct buf *)data;
< struct mlxd_softc *sc = (struct mlxd_softc *)bp->b_dev->si_drv1;
---
> struct bio *bp = (struct bio *)data;
> struct mlxd_softc *sc = (struct mlxd_softc *)bp->bio_dev->si_drv1;
214,215c214,215
< if (bp->b_ioflags & BIO_ERROR)
< bp->b_error = EIO;
---
> if (bp->bio_flags & BIO_ERROR)
> bp->bio_error = EIO;
217c217
< bp->b_resid = 0;
---
> bp->bio_resid = 0;
219c219
< devstat_end_transaction_buf(&sc->mlxd_stats, bp);
---
> devstat_end_transaction_bio(&sc->mlxd_stats, bp);
< * $FreeBSD: head/sys/dev/mlx/mlx_disk.c 59136 2000-04-11 02:52:46Z msmith $
---
> * $FreeBSD: head/sys/dev/mlx/mlx_disk.c 59249 2000-04-15 05:54:02Z phk $
168c168
< mlxd_strategy(struct buf *bp)
---
> mlxd_strategy(struct bio *bp)
170c170
< struct mlxd_softc *sc = (struct mlxd_softc *)bp->b_dev->si_drv1;
---
> struct mlxd_softc *sc = (struct mlxd_softc *)bp->bio_dev->si_drv1;
176c176
< bp->b_error = EINVAL;
---
> bp->bio_error = EINVAL;
182c182
< bp->b_error = ENXIO;
---
> bp->bio_error = ENXIO;
187c187
< if (bp->b_bcount == 0)
---
> if (bp->bio_bcount == 0)
195c195
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_flags |= BIO_ERROR;
201c201
< bp->b_resid = bp->b_bcount;
---
> bp->bio_resid = bp->bio_bcount;
209,210c209,210
< struct buf *bp = (struct buf *)data;
< struct mlxd_softc *sc = (struct mlxd_softc *)bp->b_dev->si_drv1;
---
> struct bio *bp = (struct bio *)data;
> struct mlxd_softc *sc = (struct mlxd_softc *)bp->bio_dev->si_drv1;
214,215c214,215
< if (bp->b_ioflags & BIO_ERROR)
< bp->b_error = EIO;
---
> if (bp->bio_flags & BIO_ERROR)
> bp->bio_error = EIO;
217c217
< bp->b_resid = 0;
---
> bp->bio_resid = 0;
219c219
< devstat_end_transaction_buf(&sc->mlxd_stats, bp);
---
> devstat_end_transaction_bio(&sc->mlxd_stats, bp);