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

diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 256b5aa..33f87c5 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -111,21 +111,15 @@ static int
 idad_open(dev_t dev, int flags, int fmt, struct thread *td)
 {
 	struct idad_softc *drv;
-	struct disklabel *label;
 
 	drv = idad_getsoftc(dev);
 	if (drv == NULL)
 		return (ENXIO);
 
-	label = &drv->disk.d_label;
-	bzero(label, sizeof(*label));
-	label->d_type = DTYPE_SCSI;
-	label->d_secsize = drv->secsize;
-	label->d_nsectors = drv->sectors;
-	label->d_ntracks = drv->heads;
-	label->d_ncylinders = drv->cylinders;
-	label->d_secpercyl = drv->sectors * drv->heads;
-	label->d_secperunit = drv->secperunit;
+	drv->disk.d_sectorsize = drv->secsize;
+	drv->disk.d_mediasize = (off_t)drv->secperunit * drv->secsize;
+	drv->disk.d_fwsectors = drv->sectors;
+	drv->disk.d_fwheads = drv->heads;
 
 	return (0);
 }