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@

20 files changed, 36 insertions, 87 deletions

diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c
index 7422cee8b0a..e8cdf8e7e7b 100644
--- a/sys/arch/amd64/stand/libsa/diskprobe.c
+++ b/sys/arch/amd64/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.7 2009/05/21 23:45:48 krw Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.8 2010/04/23 15:25:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -253,8 +253,6 @@ cdprobe(void)
 	strncpy(dip->disklabel.d_packname, "fictitious",
 	    sizeof(dip->disklabel.d_packname));
 	dip->disklabel.d_secperunit = 100;
-	dip->disklabel.d_rpm = 300;
-	dip->disklabel.d_interleave = 1;
 
 	dip->disklabel.d_bbsize = 2048;
 	dip->disklabel.d_sbsize = 2048;
diff --git a/sys/arch/armish/stand/boot/wd.c b/sys/arch/armish/stand/boot/wd.c
index a0f144645a2..e9bca776dd1 100644
--- a/sys/arch/armish/stand/boot/wd.c
+++ b/sys/arch/armish/stand/boot/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.7 2009/05/21 23:45:48 krw Exp $	*/
+/*	$OpenBSD: wd.c,v 1.8 2010/04/23 15:25:20 jsing Exp $	*/
 /*	$NetBSD: wd.c,v 1.5 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -131,8 +131,6 @@ wdgetdefaultlabel(wd, lp)
 		lp->d_secperunit = UINT32_MAX;
 	else
 		lp->d_secperunit = wd->sc_capacity;
-	lp->d_rpm = 3600;
-	lp->d_interleave = 1;
 	lp->d_flags = 0;
 
 	lp->d_partitions[RAW_PART].p_offset = 0;
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 5d43b09034e..7d383a501dd 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.59 2009/08/24 08:52:13 jasper Exp $	*/
+/*	$OpenBSD: hd.c,v 1.60 2010/04/23 15:25:20 jsing Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -505,8 +505,6 @@ hdgetdisklabel(dev, rs, lp, spoofonly)
 	strncpy(lp->d_packname, "fictitious", sizeof lp->d_packname);
 
 	DL_SETDSIZE(lp, hdidentinfo[rs->sc_type].ri_nblocks);
-	lp->d_rpm = 3600;
-	lp->d_interleave = 1;
 	lp->d_flags = 0;
 	lp->d_version = 1;
 
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index eacef340de3..4e0a121b9e1 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.31 2009/05/21 23:45:48 krw Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.32 2010/04/23 15:25:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -257,8 +257,6 @@ cdprobe(void)
 	strncpy(dip->disklabel.d_packname, "fictitious",
 	    sizeof(dip->disklabel.d_packname));
 	dip->disklabel.d_secperunit = 100;
-	dip->disklabel.d_rpm = 300;
-	dip->disklabel.d_interleave = 1;
 
 	dip->disklabel.d_bbsize = 2048;
 	dip->disklabel.d_sbsize = 2048;
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c
index 9233a7d0ad7..0688bb43bf8 100644
--- a/sys/arch/luna88k/luna88k/disksubr.c
+++ b/sys/arch/luna88k/luna88k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.43 2010/02/26 23:11:56 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.44 2010/04/23 15:25:20 jsing Exp $ */
 /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */
 
 /*
@@ -264,10 +264,9 @@ disklabel_om_to_bsd(struct sun_disklabel *sl, struct disklabel *lp)
 		DL_SETDSIZE(lp, (daddr64_t)secpercyl * sl->sl_ncylinders);
 	lp->d_version = 1;
 
-	lp->d_sparespercyl = 0;				/* no way to know */
+	lp->d_label_uid = sl->sl_label_uid;
+
 	lp->d_acylinders = sl->sl_acylinders;
-	lp->d_rpm = sl->sl_rpm;				/* UniOS - (empty) */
-	lp->d_interleave = sl->sl_interleave;		/* UniOS - ndisk */
 
 	if (sl->sl_rpm == 0) {
 		/* UniOS label has blkoffset, not cyloffset */
@@ -338,14 +337,15 @@ disklabel_bsd_to_om(struct disklabel *lp, struct sun_disklabel *sl)
 	sl->sl_rpm = 0;					/* UniOS */
 #if 0 /* leave as was */
 	sl->sl_pcyl = lp->d_ncylinders + lp->d_acylinders;	/* XXX */
-	sl->sl_sparespercyl = lp->d_sparespercyl;
 #endif
-	sl->sl_interleave = lp->d_interleave;
+	sl->sl_interleave = 1;
 	sl->sl_ncylinders = lp->d_ncylinders;
 	sl->sl_acylinders = lp->d_acylinders;
 	sl->sl_ntracks = lp->d_ntracks;
 	sl->sl_nsectors = lp->d_nsectors;
 
+	sl->sl_label_uid = lp->d_label_uid;
+
 	for (i = 0; i < 8; i++) {
 		spp = &sl->sl_part[i];
 		npp = &lp->d_partitions[i];
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];
diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c
index 6d4eea636f2..3a6de357144 100644
--- a/sys/arch/mvme88k/mvme88k/disksubr.c
+++ b/sys/arch/mvme88k/mvme88k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.63 2010/04/05 02:09:16 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.64 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/mvme88k/stand/libsa/bugdev.c b/sys/arch/mvme88k/stand/libsa/bugdev.c
index 944a73f213b..33cc1ffb09c 100644
--- a/sys/arch/mvme88k/stand/libsa/bugdev.c
+++ b/sys/arch/mvme88k/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
@@ -193,11 +193,7 @@ cputobsdlabel(lp, 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];
diff --git a/sys/arch/sgi/sgi/disksubr.c b/sys/arch/sgi/sgi/disksubr.c
index 8d98bca0506..a9d947640cd 100644
--- a/sys/arch/sgi/sgi/disksubr.c
+++ b/sys/arch/sgi/sgi/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.18 2009/10/09 04:25:34 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.19 2010/04/23 15:25:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -155,7 +155,6 @@ readsgilabel(struct buf *bp, void (*strat)(struct buf *),
 	lp->d_nsectors = dlp->dp.dp_secs;
 	lp->d_ntracks = dlp->dp.dp_trks0;
 	lp->d_ncylinders = dlp->dp.dp_cyls;
-	lp->d_interleave = dlp->dp.dp_interleave;
 	lp->d_npartitions = MAXPARTITIONS;
 
 	for (i = 0; i < 16; i++) {
diff --git a/sys/arch/sgi/stand/sgivol/sgivol.c b/sys/arch/sgi/stand/sgivol/sgivol.c
index 002204319d1..ff8da7ba4ef 100644
--- a/sys/arch/sgi/stand/sgivol/sgivol.c
+++ b/sys/arch/sgi/stand/sgivol/sgivol.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgivol.c,v 1.15 2009/06/04 21:57:56 miod Exp $	*/
+/*	$OpenBSD: sgivol.c,v 1.16 2010/04/23 15:25:20 jsing Exp $	*/
 /*	$NetBSD: sgivol.c,v 1.8 2003/11/08 04:59:00 sekiya Exp $	*/
 
 /*-
@@ -311,7 +311,7 @@ init_volhdr(void)
 	volhdr->dp.dp_trks0 = htobe16(lbl.d_ntracks);
 	volhdr->dp.dp_secs = htobe16(lbl.d_nsectors);
 	volhdr->dp.dp_secbytes = htobe16(lbl.d_secsize);
-	volhdr->dp.dp_interleave = htobe16(lbl.d_interleave);
+	volhdr->dp.dp_interleave = 1;
 	volhdr->dp.dp_nretries = htobe32(22);
 	volhdr->partitions[10].blocks =
 	    htobe32(DL_SECTOBLK(&lbl, lbl.d_secperunit));
diff --git a/sys/arch/socppc/stand/boot/wd.c b/sys/arch/socppc/stand/boot/wd.c
index aff7a3c313c..bb93e595d05 100644
--- a/sys/arch/socppc/stand/boot/wd.c
+++ b/sys/arch/socppc/stand/boot/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.3 2009/05/21 23:45:48 krw Exp $	*/
+/*	$OpenBSD: wd.c,v 1.4 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: wd.c,v 1.5 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -147,8 +147,6 @@ wdgetdefaultlabel(wd, lp)
 		lp->d_secperunit = UINT32_MAX;
 	else
 		lp->d_secperunit = wd->sc_capacity;
-	lp->d_rpm = 3600;
-	lp->d_interleave = 1;
 	lp->d_flags = 0;
 
 	lp->d_partitions[RAW_PART].p_offset = 0;
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 7a33dd41d06..ede25b1f2ea 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.68 2009/09/12 01:23:30 krw Exp $	*/
+/*	$OpenBSD: fd.c,v 1.69 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -1945,11 +1945,9 @@ fdgetdisklabel(dev_t dev, struct fd_softc *fd, struct disklabel *lp,
 	lp->d_ncylinders = fd->sc_type->tracks;
 	lp->d_ntracks = fd->sc_type->heads;	/* Go figure... */
 	DL_SETDSIZE(lp, fd->sc_type->size);
-	lp->d_rpm = 300;	/* XXX like it matters... */
 
 	strncpy(lp->d_typename, "floppy disk", sizeof(lp->d_typename));
 	strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
-	lp->d_interleave = 1;
 	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
diff --git a/sys/arch/sparc/dev/presto.c b/sys/arch/sparc/dev/presto.c
index 82e7c0c3ef2..a2435094985 100644
--- a/sys/arch/sparc/dev/presto.c
+++ b/sys/arch/sparc/dev/presto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: presto.c,v 1.15 2009/09/05 00:48:39 krw Exp $	*/
+/*	$OpenBSD: presto.c,v 1.16 2010/04/23 15:25:21 jsing Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -372,8 +372,6 @@ presto_getdisklabel(dev_t dev, struct presto_softc *sc)
 	strncpy(lp->d_typename, "Prestoserve", 16);
 	lp->d_type = DTYPE_SCSI;	/* what better to put here? */
 	strncpy(lp->d_packname, sc->sc_model, 16);
-	lp->d_rpm = 3600;
-	lp->d_interleave = 1;
 	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index 6513768187b..114875fbb3e 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.83 2010/02/26 23:11:57 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.84 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
 
 /*
@@ -267,10 +267,9 @@ disklabel_sun_to_bsd(struct sun_disklabel *sl, struct disklabel *lp)
 		DL_SETDSIZE(lp, (daddr64_t)secpercyl * sl->sl_ncylinders);
 	lp->d_version = 1;
 
-	lp->d_sparespercyl = sl->sl_sparespercyl;
+	lp->d_label_uid = sl->sl_label_uid;
+
 	lp->d_acylinders = sl->sl_acylinders;
-	lp->d_rpm = sl->sl_rpm;
-	lp->d_interleave = sl->sl_interleave;
 
 	lp->d_npartitions = MAXPARTITIONS;
 	/* These are as defined in <ufs/ffs/fs.h> */
@@ -408,15 +407,14 @@ disklabel_bsd_to_sun(struct disklabel *lp, struct sun_disklabel *sl)
 	/* Format conversion. */
 	bzero(sl, sizeof(*sl));
 	memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname));
-	sl->sl_rpm = lp->d_rpm;
 	sl->sl_pcylinders = lp->d_ncylinders + lp->d_acylinders; /* XXX */
-	sl->sl_sparespercyl = lp->d_sparespercyl;
-	sl->sl_interleave = lp->d_interleave;
 	sl->sl_ncylinders = lp->d_ncylinders;
 	sl->sl_acylinders = lp->d_acylinders;
 	sl->sl_ntracks = lp->d_ntracks;
 	sl->sl_nsectors = lp->d_nsectors;
 
+	sl->sl_label_uid = lp->d_label_uid;
+
 	secpercyl = sl->sl_nsectors * sl->sl_ntracks;
 	for (i = 0; i < 8; i++) {
 		spp = &sl->sl_part[i];
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index ee7cbddd59b..0778e8f36d9 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.29 2009/09/12 01:23:30 krw Exp $	*/
+/*	$OpenBSD: fd.c,v 1.30 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $	*/
 
 /*-
@@ -2021,11 +2021,9 @@ fdgetdisklabel(dev_t dev, struct fd_softc *fd, struct disklabel *lp,
 	lp->d_ncylinders = fd->sc_type->tracks;
 	lp->d_ntracks = fd->sc_type->heads;	/* Go figure... */
 	DL_SETDSIZE(lp, (daddr64_t)lp->d_secpercyl * lp->d_ncylinders);
-	lp->d_rpm = 300;	/* XXX like it matters... */
 
 	strncpy(lp->d_typename, "floppy disk", sizeof(lp->d_typename));
 	strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
-	lp->d_interleave = 1;
 	lp->d_version = 1;
 
 	lp->d_magic = DISKMAGIC;
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c
index 58d977d54e0..1df531ea2a3 100644
--- a/sys/arch/sparc64/sparc64/disksubr.c
+++ b/sys/arch/sparc64/sparc64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.58 2010/02/26 23:11:57 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.59 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */
 
 /*
@@ -260,10 +260,9 @@ disklabel_sun_to_bsd(struct sun_disklabel *sl, struct disklabel *lp)
 		DL_SETDSIZE(lp, (daddr64_t)secpercyl * sl->sl_ncylinders);
 	lp->d_version = 1;
 
-	lp->d_sparespercyl = sl->sl_sparespercyl;
+	lp->d_label_uid = sl->sl_label_uid;
+
 	lp->d_acylinders = sl->sl_acylinders;
-	lp->d_rpm = sl->sl_rpm;
-	lp->d_interleave = sl->sl_interleave;
 
 	lp->d_npartitions = MAXPARTITIONS;
 	/* These are as defined in <ufs/ffs/fs.h> */
@@ -401,15 +400,14 @@ disklabel_bsd_to_sun(struct disklabel *lp, struct sun_disklabel *sl)
 	/* Format conversion. */
 	bzero(sl, sizeof(*sl));
 	memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname));
-	sl->sl_rpm = lp->d_rpm;
 	sl->sl_pcylinders = lp->d_ncylinders + lp->d_acylinders; /* XXX */
-	sl->sl_sparespercyl = lp->d_sparespercyl;
-	sl->sl_interleave = lp->d_interleave;
 	sl->sl_ncylinders = lp->d_ncylinders;
 	sl->sl_acylinders = lp->d_acylinders;
 	sl->sl_ntracks = lp->d_ntracks;
 	sl->sl_nsectors = lp->d_nsectors;
 
+	sl->sl_label_uid = lp->d_label_uid;
+
 	secpercyl = sl->sl_nsectors * sl->sl_ntracks;
 	for (i = 0; i < 8; i++) {
 		spp = &sl->sl_part[i];
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c
index 325051b0400..745264bebbf 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.c
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.c,v 1.12 2009/11/04 12:03:57 jsing Exp $	*/
+/*	$OpenBSD: ofdev.c,v 1.13 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $	*/
 
 /*
@@ -258,10 +258,7 @@ disklabel_sun_to_bsd(char *cp, struct disklabel *lp)
 	lp->d_secpercyl  = secpercyl;
 	lp->d_secperunit = secpercyl * sl->sl_ncylinders;
 
-	lp->d_sparespercyl = sl->sl_sparespercyl;
 	lp->d_acylinders   = sl->sl_acylinders;
-	lp->d_rpm          = sl->sl_rpm;
-	lp->d_interleave   = sl->sl_interleave;
 
 	lp->d_npartitions = MAXPARTITIONS;
 	/* These are as defined in <ufs/ffs/fs.h> */
diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c
index 4ea13d908b5..28d1e734223 100644
--- a/sys/arch/vax/mscp/mscp_disk.c
+++ b/sys/arch/vax/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_disk.c,v 1.26 2009/08/13 15:23:13 deraadt Exp $	*/
+/*	$OpenBSD: mscp_disk.c,v 1.27 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -832,10 +832,8 @@ rronline(usc, mp)
 	if (dl->d_secpercyl) {
 		dl->d_ncylinders = DL_GETDSIZE(dl) / dl->d_secpercyl;
 		dl->d_type = DTYPE_MSCP;
-		dl->d_rpm = 3600;
 	} else {
 		dl->d_type = DTYPE_FLOPPY;
-		dl->d_rpm = 300;
 	}
 	rrmakelabel(dl, rx->ra_mediaid);
 
@@ -873,7 +871,6 @@ rrmakelabel(dl, type)
 	DL_SETPSIZE(&dl->d_partitions[2], DL_GETDSIZE(dl));
 	DL_SETPOFFSET(&dl->d_partitions[0], 0);
 	DL_SETPOFFSET(&dl->d_partitions[2], 0);
-	dl->d_interleave = 1;
 	dl->d_version = 1;
 	dl->d_magic = dl->d_magic2 = DISKMAGIC;
 	dl->d_checksum = dkcksum(dl);
diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c
index be06500f518..891123ab065 100644
--- a/sys/arch/vax/vsa/hdc9224.c
+++ b/sys/arch/vax/vsa/hdc9224.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hdc9224.c,v 1.26 2009/09/05 15:37:04 deraadt Exp $	*/
+/*	$OpenBSD: hdc9224.c,v 1.27 2010/04/23 15:25:21 jsing Exp $	*/
 /*	$NetBSD: hdc9224.c,v 1.16 2001/07/26 15:05:09 wiz Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -852,7 +852,6 @@ hdmakelabel(struct disklabel *dl, struct hdgeom *g)
 	dl->d_typename[p++] = n + '0';
 	dl->d_typename[p] = 0;
 	dl->d_type = DTYPE_MSCP; /* XXX - what to use here??? */
-	dl->d_rpm = 3600;
 	dl->d_secsize = DEV_BSIZE;
 
 	DL_SETDSIZE(dl, g->lbn_count);
@@ -867,7 +866,6 @@ hdmakelabel(struct disklabel *dl, struct hdgeom *g)
 	    
 	DL_SETPOFFSET(&dl->d_partitions[0], 0);
 	DL_SETPOFFSET(&dl->d_partitions[2], 0);
-	dl->d_interleave = 1;
 	dl->d_version = 1;
 	dl->d_magic = dl->d_magic2 = DISKMAGIC;
 	dl->d_checksum = dkcksum(dl);