diff options
| author | kato <kato@FreeBSD.org> | 1999-08-29 05:05:27 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1999-08-29 05:05:27 +0000 |
| commit | bd14e46d740faa5132d836cc532864ff7f41f228 (patch) | |
| tree | 560e0e15db7ad8d24b85c21cec7742bf723ffb52 | |
| parent | 2e0328a8baf5121ec633f7f86802975bc0fb7315 (diff) | |
| download | FreeBSD-src-bd14e46d740faa5132d836cc532864ff7f41f228.zip FreeBSD-src-bd14e46d740faa5132d836cc532864ff7f41f228.tar.gz | |
Changed from dname into devtoname(bp->b_dev) in the function dsinit().
| -rw-r--r-- | sys/pc98/pc98/diskslice_machdep.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c index 12038c0..95d7139 100644 --- a/sys/pc98/pc98/diskslice_machdep.c +++ b/sys/pc98/pc98/diskslice_machdep.c @@ -200,8 +200,7 @@ check_part(sname, dp, offset, nsectors, ntracks, mbr_offset ) } int -dsinit(dname, dev, lp, sspp) - char *dname; +dsinit(dev, lp, sspp) dev_t dev; struct disklabel *lp; struct diskslices **sspp; @@ -248,7 +247,8 @@ reread_mbr: #endif BUF_STRATEGY(bp, 1); if (biowait(bp) != 0) { - diskerr(bp, dname, "error reading primary partition table", + diskerr(bp, devtoname(bp->b_dev), + "error reading primary partition table", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); error = EIO; @@ -319,11 +319,12 @@ reread_mbr: */ if (((cp[4] != 'I') || (cp[5] != 'P') || (cp[6] != 'L') || (cp[7] != '1')) && - ((strncmp(dname, "sd", 2) == 0) || (strncmp(dname, "wd", 2) == 0))) { + ((strncmp(devtoname(bp->b_dev), "sd", 2) == 0) || + (strncmp(devtoname(bp->b_dev), "wd", 2) == 0))) { /* IBM-PC HDD */ bp->b_flags = B_INVAL | B_AGE; brelse(bp); - return atcompat_dsinit(dname, dev, lp, sspp); + return atcompat_dsinit(devtoname(bp->b_dev), dev, lp, sspp); } #endif dp0 = (struct dos_partition *)(cp + 512); |
