(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, 6 insertions, 7 deletions

diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 610f1ac..ac2a8ab 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -116,7 +116,7 @@ flaopen(dev_t dev, int flag, int fmt, struct thread *td)
 {
 	struct fla_s *sc;
 	int error;
-	struct disklabel *dl;
+	u_int spu, ncyl, nt, ns;
 
 	if (fla_debug)
 		printf("flaopen(%s %x %x %p)\n",
@@ -131,12 +131,11 @@ flaopen(dev_t dev, int flag, int fmt, struct thread *td)
 		return (EIO);
 	}
 
-	dl = &sc->disk.d_label;
-	bzero(dl, sizeof(*dl));
-	error = doc2k_size(sc->unit, &dl->d_secperunit,
-	    &dl->d_ncylinders, &dl->d_ntracks, &dl->d_nsectors);
-	dl->d_secsize = DEV_BSIZE;
-	dl->d_secpercyl = dl->d_ntracks * dl->d_nsectors; /* XXX */
+	error = doc2k_size(sc->unit, &spu, &ncyl, &nt, &ns);
+	sc->disk.d_sectorsize = DEV_BSIZE;
+	sc->disk.d_mediasize = (off_t)spu * DEV_BSIZE;
+	sc->disk.d_fwsectors = ns;
+	sc->disk.d_fwheads = nt;
 
 	return (0);
 }