From 02e550fabbccfb3ee4ca8b767f672f042bce9239 Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 21 Feb 2003 19:00:48 +0000 Subject: 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. --- sys/dev/ata/ata-disk.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sys/dev/ata/ata-disk.c') diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 6478171..13906ab 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -55,7 +55,7 @@ static d_open_t adopen; static d_close_t adclose; static d_strategy_t adstrategy; -static d_dump_t addump; +static dumper_t addump; static struct cdevsw ad_cdevsw = { /* open */ adopen, /* close */ adclose, @@ -315,12 +315,15 @@ adstrategy(struct bio *bp) } static int -addump(dev_t dev, void *virtual, vm_offset_t physical, off_t offset, size_t length) +addump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length) { - struct ad_softc *adp = dev->si_drv1; + struct ad_softc *adp; struct ad_request request; static int once; + struct disk *dp; + dp = arg; + adp = dp->d_dev->si_drv1; if (!adp) return ENXIO; -- cgit v1.1