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/kern/subr_disklabel.c | |
| 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/kern/subr_disklabel.c')
| -rw-r--r-- | sys/kern/subr_disklabel.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index 551652f..8a1fc0b 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -453,14 +453,14 @@ hp0g: hard error reading fsbn 12345 of 12344-12347 (hp0 bn %d cn %d tn %d sn %d) */ void diskerr(bp, what, pri, blkdone, lp) - register struct buf *bp; + struct bio *bp; char *what; int pri, blkdone; register struct disklabel *lp; { - int unit = dkunit(bp->b_dev); - int slice = dkslice(bp->b_dev); - int part = dkpart(bp->b_dev); + int unit = dkunit(bp->bio_dev); + int slice = dkslice(bp->bio_dev); + int part = dkpart(bp->bio_dev); register int (*pr) __P((const char *, ...)); char partname[2]; char *sname; @@ -471,21 +471,21 @@ diskerr(bp, what, pri, blkdone, lp) pr = addlog; } else pr = printf; - sname = dsname(bp->b_dev, unit, slice, part, partname); + sname = dsname(bp->bio_dev, unit, slice, part, partname); (*pr)("%s%s: %s %sing fsbn ", sname, partname, what, - bp->b_iocmd == BIO_READ ? "read" : "writ"); - sn = bp->b_blkno; - if (bp->b_bcount <= DEV_BSIZE) + bp->bio_cmd == BIO_READ ? "read" : "writ"); + sn = bp->bio_blkno; + if (bp->bio_bcount <= DEV_BSIZE) (*pr)("%ld", (long)sn); else { if (blkdone >= 0) { sn += blkdone; (*pr)("%ld of ", (long)sn); } - (*pr)("%ld-%ld", (long)bp->b_blkno, - (long)(bp->b_blkno + (bp->b_bcount - 1) / DEV_BSIZE)); + (*pr)("%ld-%ld", (long)bp->bio_blkno, + (long)(bp->bio_blkno + (bp->bio_bcount - 1) / DEV_BSIZE)); } - if (lp && (blkdone >= 0 || bp->b_bcount <= lp->d_secsize)) { + if (lp && (blkdone >= 0 || bp->bio_bcount <= lp->d_secsize)) { #ifdef tahoe sn *= DEV_BSIZE / lp->d_secsize; /* XXX */ #endif |
