d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use dkmakeminor() rather than magic knowledge of the size and location of

Browse Source 
the slice field.  Handle incomprehensible slice numbers slightly better.
Suggested by:	bde
This commit is contained in:
Mike Smith 1998-03-16 11:50:39 +00:00
parent 45a0558c0a
commit 2167f84289
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=34622
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.88 1998/03/09 08:35:33 msmith Exp $
* $Id: autoconf.c,v 1.89 1998/03/15 04:42:23 msmith Exp $
*/
/*
@ -457,8 +457,8 @@ setroot()
adaptor = B_ADAPTOR(bootdev);
unit = B_UNIT(bootdev);
slice = B_SLICE(bootdev);
if ((slice < BASE_SLICE) || (slice > MAX_SLICES))
slice = BASE_SLICE;
if ((slice < BASE_SLICE) || (slice >= MAX_SLICES))
slice = COMPATABILITY_SLICE;
if (majdev > sizeof(devname) / sizeof(devname[0]))
return;
if (majdev == FDMAJOR) {
@ -467,7 +467,7 @@ setroot()
}
else {
part = (bootdev >> B_PARTITIONSHIFT) & B_PARTITIONMASK;
mindev = (slice << 16) + (unit << PARTITIONSHIFT) + part;
mindev = dkmakeminor(unit, slice, part);
}
orootdev = rootdev;
rootdev = makedev(majdev, mindev);

8
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.88 1998/03/09 08:35:33 msmith Exp $
* $Id: autoconf.c,v 1.89 1998/03/15 04:42:23 msmith Exp $
*/
/*
@ -457,8 +457,8 @@ setroot()
adaptor = B_ADAPTOR(bootdev);
unit = B_UNIT(bootdev);
slice = B_SLICE(bootdev);
if ((slice < BASE_SLICE) || (slice > MAX_SLICES))
slice = BASE_SLICE;
if ((slice < BASE_SLICE) || (slice >= MAX_SLICES))
slice = COMPATABILITY_SLICE;
if (majdev > sizeof(devname) / sizeof(devname[0]))
return;
if (majdev == FDMAJOR) {
@ -467,7 +467,7 @@ setroot()
}
else {
part = (bootdev >> B_PARTITIONSHIFT) & B_PARTITIONMASK;
mindev = (slice << 16) + (unit << PARTITIONSHIFT) + part;
mindev = dkmakeminor(unit, slice, part);
}
orootdev = rootdev;
rootdev = makedev(majdev, mindev);