diff options
author | phk <phk@FreeBSD.org> | 2000-04-02 15:24:56 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2000-04-02 15:24:56 +0000 |
commit | 8ee11d587fcf66a50146b00f04bb5db7b955b795 (patch) | |
tree | c184bd0e6c7538049e6b3655c28f4556a7c1a465 /sys/dev/ccd | |
parent | 090fde9a7695bc804b6a26eb67cb706fd805231a (diff) | |
download | FreeBSD-src-8ee11d587fcf66a50146b00f04bb5db7b955b795.zip FreeBSD-src-8ee11d587fcf66a50146b00f04bb5db7b955b795.tar.gz |
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.
Diffstat (limited to 'sys/dev/ccd')
-rw-r--r-- | sys/dev/ccd/ccd.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index dcab05e..760734d 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -779,7 +779,7 @@ ccdstrategy(bp) #endif if ((cs->sc_flags & CCDF_INITED) == 0) { bp->b_error = ENXIO; - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; goto done; } @@ -813,7 +813,8 @@ ccdstrategy(bp) bp->b_resid = bp->b_bcount; if (pbn != cs->sc_size) { bp->b_error = EINVAL; - bp->b_flags |= B_ERROR | B_INVAL; + bp->b_flags |= B_INVAL; + bp->b_ioflags |= BIO_ERROR; } goto done; } @@ -1108,7 +1109,7 @@ ccdintr(cs, bp) /* * Request is done for better or worse, wakeup the top half. */ - if (bp->b_flags & B_ERROR) + if (bp->b_ioflags & BIO_ERROR) bp->b_resid = bp->b_bcount; devstat_end_transaction_buf(&cs->device_stats, bp); biodone(bp); @@ -1148,7 +1149,7 @@ ccdiodone(ibp) * succeed. */ - if (cbp->cb_buf.b_flags & B_ERROR) { + if (cbp->cb_buf.b_ioflags & BIO_ERROR) { const char *msg = ""; if ((ccd_softc[unit].sc_cflags & CCDF_MIRROR) && @@ -1166,7 +1167,7 @@ ccdiodone(ibp) cs->sc_pick = 1 - cs->sc_pick; cs->sc_blk[cs->sc_pick] = bp->b_blkno; } else { - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; bp->b_error = cbp->cb_buf.b_error ? cbp->cb_buf.b_error : EIO; } @@ -1204,7 +1205,7 @@ ccdiodone(ibp) * occured with this one. */ if ((cbp->cb_pflags & CCDPF_MIRROR_DONE) == 0) { - if (cbp->cb_buf.b_flags & B_ERROR) { + if (cbp->cb_buf.b_ioflags & BIO_ERROR) { cbp->cb_mirror->cb_pflags |= CCDPF_MIRROR_DONE; BUF_STRATEGY(&cbp->cb_mirror->cb_buf); |