diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-02-21 15:13:26 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-02-21 15:13:26 +0000 |
| commit | b82ff758542333406c15ae101ee37865654f2270 (patch) | |
| tree | 370edd6c82f8299ccece035af1b2441f573823c0 /sys/geom | |
| parent | e85983352970f10d4ee3e1c8db3df53c3e2da6a0 (diff) | |
| download | src-b82ff758542333406c15ae101ee37865654f2270.tar.gz src-b82ff758542333406c15ae101ee37865654f2270.zip | |
NO_GEOM cleanup:
Change the argument to disk_destroy() to be the same struct disk * as
disk_create() takes.
This enables drivers to ignore the (now) bogus dev_t which disk_create()
returns.
Notes
Notes:
svn path=/head/; revision=111216
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/geom_ccd.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_disk.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index d947708b6021..5fb49c584592 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -1160,7 +1160,7 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td) return (EBUSY); } - disk_destroy(cs->sc_dev); + disk_destroy(cs->sc_disk); free(cs->sc_disk, M_CCD); cs->sc_disk = NULL; /* Declare unit null and void (reset all flags) */ diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index 1f7e8b0c69c7..7cf3c48b131d 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -364,14 +364,12 @@ disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, void * } void -disk_destroy(dev_t dev) +disk_destroy(struct disk *dp) { - struct disk *dp; struct g_geom *gp; - dp = dev->si_disk; gp = dp->d_geom; - g_free(dev); + g_free(dp->d_dev); gp->flags |= G_GEOM_WITHER; gp->softc = NULL; g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO); |