From aaaef0b54e307450b19dcd1fb6ec921cc62d1acf Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 15 Apr 2000 05:54:02 +0000 Subject: 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 --- sys/kern/subr_diskmbr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/kern/subr_diskmbr.c') diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index f9e2eba..0d63747 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -190,7 +190,7 @@ reread_mbr: bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); if (biowait(bp) != 0) { - diskerr(bp, "reading primary partition table: error", + diskerr(&bp->b_io, "reading primary partition table: error", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); error = EIO; @@ -406,7 +406,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors, bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); if (biowait(bp) != 0) { - diskerr(bp, "reading extended partition table: error", + diskerr(&bp->b_io, "reading extended partition table: error", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); goto done; -- cgit v1.1