NO_GEOM cleanup:

Retire the "d_dump_t" and use the "dumper_t" type instead.

Dumper_t takes a void * as first arg which is more general than the
dev_t taken by d_dump_t.  (Remember: we could have net-dumpers if
somebody wrote us one!)

Define the convention for GEOM controlled disk devices to be that the
first argument to the dumper function is the struct disk pointer.

Change device drivers accordingly.

1 files changed, 5 insertions, 3 deletions

diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index e93dce8..f4265c9 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -61,7 +61,7 @@ static int idad_detach(device_t dev);
 static	d_open_t	idad_open;
 static	d_close_t	idad_close;
 static	d_strategy_t	idad_strategy;
-static	d_dump_t	idad_dump;
+static	dumper_t	idad_dump;
 
 #define IDAD_CDEV_MAJOR	109
 
@@ -180,13 +180,15 @@ bad:
 }
 
 static int
-idad_dump(dev_t dev, void *virtual, vm_offset_t physical, off_t offset, size_t length)
+idad_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length)
 {
 
 	struct idad_softc *drv;
 	int error = 0;
+	struct disk *dp;
 
-	drv = idad_getsoftc(dev);
+	dp = arg;
+	drv = idad_getsoftc(dp->d_dev);
 	if (drv == NULL)
 		return (ENXIO);