From 8ee11d587fcf66a50146b00f04bb5db7b955b795 Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 2 Apr 2000 15:24:56 +0000 Subject: Move B_ERROR flag to b_ioflags and call it BIO_ERROR. (Much of this done by script) Move B_ORDERED flag to b_ioflags and call it BIO_ORDERED. Move b_pblkno and b_iodone_chain to struct bio while we transition, they will be obsoleted once bio structs chain/stack. Add bio_queue field for struct bio aware disksort. Address a lot of stylistic issues brought up by bde. --- sys/dev/ata/atapi-fd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev/ata/atapi-fd.c') diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index c0a8cc4..1b7e177 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -309,7 +309,7 @@ afd_start(struct atapi_softc *atp) /* should reject all queued entries if media have changed. */ if (fdp->atp->flags & ATAPI_F_MEDIA_CHANGED) { bp->b_error = EIO; - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; biodone(bp); return; } @@ -364,7 +364,7 @@ afd_partial_done(struct atapi_request *request) if (request->error) { bp->b_error = request->error; - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; } bp->b_resid += request->bytecount; return 0; @@ -376,9 +376,9 @@ afd_done(struct atapi_request *request) struct buf *bp = request->driver; struct afd_softc *fdp = request->device->driver; - if (request->error || (bp->b_flags & B_ERROR)) { + if (request->error || (bp->b_ioflags & BIO_ERROR)) { bp->b_error = request->error; - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; } else bp->b_resid += (bp->b_bcount - request->donecount); -- cgit v1.1