(This commit touches about 15 disk device drivers in a very consistent

and predictable way, and I apologize if I have gotten it wrong anywhere,
getting prior review on a patch like this is not feasible, considering
the number of people involved and hardware availability etc.)

If struct disklabel is the messenger: kill the messenger.

Inside struct disk we had a struct disklabel which disk drivers used to
communicate certain metrics to the disklayer above (GEOM or the disk
mini-layer).  This commit changes this communication to use four
explicit fields instead.

Amongst the benefits is that the fields do not get overwritten by
wrong or bogus on-disk disklabels.

Once that is clear, <sys/disk.h> which is included in the drivers
no longer need to pull <sys/disklabel.h> and <sys/diskslice.h> in,
the few places that needs them, have gotten explicit #includes for
them.

The disklabel inside struct disk is now only for internal use in
the disk mini-layer, so instead of embedding it, we malloc it as
we need it.

This concludes (modulus any mistakes) the series of disklabel related
commits.

I belive it all amounts to a NOP for all the rest of you :-)

Sponsored by:   DARPA & NAI Labs.

1 files changed, 5 insertions, 10 deletions

diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 7640604..032c5fe 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -360,7 +360,6 @@ static int
 mdopen(dev_t dev, int flag, int fmt, struct thread *td)
 {
 	struct md_s *sc;
-	struct disklabel *dl;
 
 	if (md_debug)
 		printf("mdopen(%s %x %x %p)\n",
@@ -368,14 +367,10 @@ mdopen(dev_t dev, int flag, int fmt, struct thread *td)
 
 	sc = dev->si_drv1;
 
-	dl = &sc->disk.d_label;
-	bzero(dl, sizeof(*dl));
-	dl->d_secsize = sc->secsize;
-	dl->d_nsectors = sc->nsect > 63 ? 63 : sc->nsect;
-	dl->d_ntracks = 1;
-	dl->d_secpercyl = dl->d_nsectors * dl->d_ntracks;
-	dl->d_secperunit = sc->nsect;
-	dl->d_ncylinders = dl->d_secperunit / dl->d_secpercyl;
+	sc->disk.d_sectorsize = sc->secsize;
+	sc->disk.d_mediasize = (off_t)sc->nsect * sc->secsize;
+	sc->disk.d_fwsectors = 0;
+	sc->disk.d_fwheads = 0;
 	sc->opencount++;
 	return (0);
 }
@@ -646,7 +641,7 @@ mdnew(int unit)
 	}
 	if (unit == -1)
 		unit = max + 1;
-	if (unit > DKMAXUNIT)
+	if (unit > 255)
 		return (NULL);
 	sc = (struct md_s *)malloc(sizeof *sc, M_MD, M_WAITOK | M_ZERO);
 	sc->unit = unit;