28c28
< * $FreeBSD: head/sys/cam/scsi/scsi_pt.c 58934 2000-04-02 15:24:56Z phk $
---
> * $FreeBSD: head/sys/cam/scsi/scsi_pt.c 59249 2000-04-15 05:54:02Z phk $
79c79
< struct buf_queue_head buf_queue;
---
> struct bio_queue_head bio_queue;
218c218
< ptstrategy(struct buf *bp)
---
> ptstrategy(struct bio *bp)
225c225
< unit = minor(bp->b_dev);
---
> unit = minor(bp->bio_dev);
228c228
< bp->b_error = ENXIO;
---
> bp->bio_error = ENXIO;
245c245
< bp->b_error = ENXIO;
---
> bp->bio_error = ENXIO;
252c252
< bufq_insert_tail(&softc->buf_queue, bp);
---
> bioq_insert_tail(&softc->bio_queue, bp);
263c263
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_flags |= BIO_ERROR;
268c268
< bp->b_resid = bp->b_bcount;
---
> bp->bio_resid = bp->bio_bcount;
342c342
< bufq_init(&softc->buf_queue);
---
> bioq_init(&softc->bio_queue);
385c385
< struct buf *q_bp;
---
> struct bio *q_bp;
415,419c415,419
< while ((q_bp = bufq_first(&softc->buf_queue)) != NULL){
< bufq_remove(&softc->buf_queue, q_bp);
< q_bp->b_resid = q_bp->b_bcount;
< q_bp->b_error = ENXIO;
< q_bp->b_ioflags |= BIO_ERROR;
---
> while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){
> bioq_remove(&softc->bio_queue, q_bp);
> q_bp->bio_resid = q_bp->bio_bcount;
> q_bp->bio_error = ENXIO;
> q_bp->bio_flags |= BIO_ERROR;
509c509
< struct buf *bp;
---
> struct bio *bp;
518c518
< bp = bufq_first(&softc->buf_queue);
---
> bp = bioq_first(&softc->bio_queue);
534c534
< bufq_remove(&softc->buf_queue, bp);
---
> bioq_remove(&softc->bio_queue, bp);
542c542
< bp->b_iocmd == BIO_READ,
---
> bp->bio_cmd == BIO_READ,
544,545c544,545
< bp->b_bcount,
< bp->b_data,
---
> bp->bio_bcount,
> bp->bio_data,
561c561
< bp = bufq_first(&softc->buf_queue);
---
> bp = bioq_first(&softc->bio_queue);
585c585
< struct buf *bp;
---
> struct bio *bp;
588c588
< bp = (struct buf *)done_ccb->ccb_h.ccb_bp;
---
> bp = (struct bio *)done_ccb->ccb_h.ccb_bp;
609c609
< struct buf *q_bp;
---
> struct bio *q_bp;
628c628
< while ((q_bp = bufq_first(&softc->buf_queue))
---
> while ((q_bp = bioq_first(&softc->bio_queue))
630,633c630,633
< bufq_remove(&softc->buf_queue, q_bp);
< q_bp->b_resid = q_bp->b_bcount;
< q_bp->b_error = EIO;
< q_bp->b_ioflags |= BIO_ERROR;
---
> bioq_remove(&softc->bio_queue, q_bp);
> q_bp->bio_resid = q_bp->bio_bcount;
> q_bp->bio_error = EIO;
> q_bp->bio_flags |= BIO_ERROR;
637,639c637,639
< bp->b_error = error;
< bp->b_resid = bp->b_bcount;
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_error = error;
> bp->bio_resid = bp->bio_bcount;
> bp->bio_flags |= BIO_ERROR;
641,643c641,643
< bp->b_resid = csio->resid;
< bp->b_error = 0;
< if (bp->b_resid != 0) {
---
> bp->bio_resid = csio->resid;
> bp->bio_error = 0;
> if (bp->bio_resid != 0) {
645c645
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_flags |= BIO_ERROR;
655,657c655,657
< bp->b_resid = csio->resid;
< if (bp->b_resid != 0)
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_resid = csio->resid;
> if (bp->bio_resid != 0)
> bp->bio_flags |= BIO_ERROR;
668c668
< devstat_end_transaction_buf(&softc->device_stats, bp);
---
> devstat_end_transaction_bio(&softc->device_stats, bp);