diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-11-26 19:29:15 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-11-26 19:29:15 +0000 |
| commit | cb7e609a3c2f461f8c7c44585358e397afc0ff02 (patch) | |
| tree | efcc8a1acdfb1ceb668931c68186c4aa63e52acf /sys/pc98 | |
| parent | a1bb9fabb15af00f8c2f2aad34f2b39753833f58 (diff) | |
Notes
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/fdc.c | 2 | ||||
| -rw-r--r-- | sys/pc98/pc98/diskslice_machdep.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/fd.c | 2 | ||||
| -rw-r--r-- | sys/pc98/pc98/wd.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 7a635b4f3697..a58019b32852 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -2665,7 +2665,7 @@ retrier(struct fdc_data *fdc) /* Trick diskerr */ bp->bio_dev = makedev(major(bp->bio_dev), (FDUNIT(minor(bp->bio_dev))<<3)|RAW_PART); - diskerr(bp, "hard error", LOG_PRINTF, + diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE, (struct disklabel *)NULL); bp->bio_dev = sav_bio_dev; diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c index 027549be3322..a9cc60f32a48 100644 --- a/sys/pc98/pc98/diskslice_machdep.c +++ b/sys/pc98/pc98/diskslice_machdep.c @@ -252,7 +252,7 @@ reread_mbr: DEV_STRATEGY(bp, 1); if (bufwait(bp) != 0) { diskerr(&bp->b_io, "reading primary partition table: error", - LOG_PRINTF, 0, (struct disklabel *)NULL); + 0, (struct disklabel *)NULL); printf("\n"); error = EIO; goto done; @@ -553,7 +553,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors, BUF_STRATEGY(bp, 1); if (bufwait(bp) != 0) { diskerr(bp, "reading extended partition table: error", - LOG_PRINTF, 0, (struct disklabel *)NULL); + 0, (struct disklabel *)NULL); printf("\n"); goto done; } diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index 7a635b4f3697..a58019b32852 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -2665,7 +2665,7 @@ retrier(struct fdc_data *fdc) /* Trick diskerr */ bp->bio_dev = makedev(major(bp->bio_dev), (FDUNIT(minor(bp->bio_dev))<<3)|RAW_PART); - diskerr(bp, "hard error", LOG_PRINTF, + diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE, (struct disklabel *)NULL); bp->bio_dev = sav_bio_dev; diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 513e3eb212e4..7f6ebe0ce34f 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -1880,7 +1880,7 @@ wderror(struct bio *bp, struct softc *du, char *mesg) if (bp == NULL) printf("wd%d: %s", du->dk_lunit, mesg); else - diskerr(bp, mesg, LOG_PRINTF, du->dk_skip, + diskerr(bp, mesg, du->dk_skip, dsgetlabel(bp->bio_dev, du->dk_slices)); printf(" (status %b error %b)\n", du->dk_status, WDCS_BITS, du->dk_error, WDERR_BITS); |
