diff options
| author | phk <phk@FreeBSD.org> | 2000-04-15 05:54:02 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-04-15 05:54:02 +0000 |
| commit | aaaef0b54e307450b19dcd1fb6ec921cc62d1acf (patch) | |
| tree | 175dac1aaf0d06b54deb889161091dbcf88c79c6 /sys/dev/ccd | |
| parent | f2310ef109eccf99c872f4f90eb70f4fc26e39f1 (diff) | |
| download | FreeBSD-src-aaaef0b54e307450b19dcd1fb6ec921cc62d1acf.zip FreeBSD-src-aaaef0b54e307450b19dcd1fb6ec921cc62d1acf.tar.gz | |
Complete the bio/buf divorce for all code below devfs::strategy
Exceptions:
Vinum untouched. This means that it cannot be compiled.
Greg Lehey is on the case.
CCD not converted yet, casts to struct buf (still safe)
atapi-cd casts to struct buf to examine B_PHYS
Diffstat (limited to 'sys/dev/ccd')
| -rw-r--r-- | sys/dev/ccd/ccd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 760734d..92f8b61 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -764,9 +764,10 @@ ccdclose(dev, flags, fmt, p) } static void -ccdstrategy(bp) - struct buf *bp; +ccdstrategy(bip) + struct bio *bip; { + struct buf *bp = (struct buf *)bip; int unit = ccdunit(bp->b_dev); struct ccd_softc *cs = &ccd_softc[unit]; int s; @@ -795,7 +796,7 @@ ccdstrategy(bp) */ wlabel = cs->sc_flags & (CCDF_WLABEL|CCDF_LABELLING); if (ccdpart(bp->b_dev) != RAW_PART) { - if (bounds_check_with_label(bp, lp, wlabel) <= 0) + if (bounds_check_with_label(&bp->b_io, lp, wlabel) <= 0) goto done; } else { int pbn; /* in sc_secsize chunks */ @@ -838,7 +839,7 @@ ccdstrategy(bp) splx(s); return; done: - biodone(bp); + bufdone(bp); } static void @@ -1112,7 +1113,7 @@ ccdintr(cs, bp) if (bp->b_ioflags & BIO_ERROR) bp->b_resid = bp->b_bcount; devstat_end_transaction_buf(&cs->device_stats, bp); - biodone(bp); + bufdone(bp); } /* |
