diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2010-04-23 15:25:22 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2010-04-23 15:25:22 +0000 |
| commit | 38fc778c9782dbaa70fa6da92cfd8daaaa43d6fe (patch) | |
| tree | ae3cdf39a2c58715ddd572c6ba0e0e6d72ea4ce2 /sys/arch/mvme68k | |
| parent | ed069888a3c009f9af5ecffb1dd73b037a5b95c2 (diff) | |
Recycle unused disklabel fields in order to create a disklabel unique
identifier, allowing the disk to be identified without relying on the
device name.
ok deraadt@ krw@ beck@ marco@ todd@
Diffstat (limited to 'sys/arch/mvme68k')
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/disksubr.c | 11 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/libsa/bugdev.c | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c index 16d1dd89813..d369f6d82b6 100644 --- a/sys/arch/mvme68k/mvme68k/disksubr.c +++ b/sys/arch/mvme68k/mvme68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.67 2010/04/05 02:09:15 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.68 2010/04/23 15:25:20 jsing Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -162,12 +162,9 @@ bsdtocpulabel(struct disklabel *lp, struct mvmedisklabel *clp) clp->secpercyl = lp->d_secpercyl; clp->secperunit = DL_GETDSIZE(lp); - clp->sparespertrack = lp->d_sparespertrack; - clp->sparespercyl = lp->d_sparespercyl; clp->acylinders = lp->d_acylinders; - clp->rpm = lp->d_rpm; - clp->cfg_ilv = lp->d_interleave; + clp->cfg_ilv = 1; clp->cfg_sof = 1; clp->cylskew = 1; clp->headswitch = 0; @@ -218,11 +215,7 @@ cputobsdlabel(struct disklabel *lp, struct mvmedisklabel *clp) lp->d_secpercyl = clp->secpercyl; if (DL_GETDSIZE(lp) == 0) DL_SETDSIZE(lp, clp->secperunit); - lp->d_sparespertrack = clp->sparespertrack; - lp->d_sparespercyl = clp->sparespercyl; lp->d_acylinders = clp->acylinders; - lp->d_rpm = clp->rpm; - lp->d_interleave = clp->cfg_ilv; lp->d_flags = clp->flags; for (i = 0; i < NDDATA; i++) lp->d_drivedata[i] = clp->drivedata[i]; diff --git a/sys/arch/mvme68k/stand/libsa/bugdev.c b/sys/arch/mvme68k/stand/libsa/bugdev.c index a17616a4608..a9c96b59569 100644 --- a/sys/arch/mvme68k/stand/libsa/bugdev.c +++ b/sys/arch/mvme68k/stand/libsa/bugdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugdev.c,v 1.5 2009/06/04 21:57:56 miod Exp $ */ +/* $OpenBSD: bugdev.c,v 1.6 2010/04/23 15:25:20 jsing Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -178,11 +178,7 @@ cputobsdlabel(struct disklabel *lp, struct mvmedisklabel *clp) lp->d_secperunit = clp->secperunit; lp->d_secpercyl = clp->secpercyl; lp->d_secperunit = clp->secperunit; - lp->d_sparespertrack = clp->sparespertrack; - lp->d_sparespercyl = clp->sparespercyl; lp->d_acylinders = clp->acylinders; - lp->d_rpm = clp->rpm; - lp->d_interleave = clp->cfg_ilv; lp->d_flags = clp->flags; for (i = 0; i < NDDATA; i++) lp->d_drivedata[i] = clp->drivedata[i]; |