Changed from dname into devtoname(bp->b_dev) in the function dsinit().
This commit is contained in:
parent
bfbdd545e1
commit
a8c345fb03
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=50542
@ -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 @@ dsinit(dname, dev, lp, sspp)
|
||||
#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 @@ dsinit(dname, dev, lp, sspp)
|
||||
*/
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user