37c37
< __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 227309 2011-11-07 15:43:11Z ed $");
---
> __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 237518 2012-06-24 04:29:03Z ken $");
77a78
> static g_provgone_t g_disk_providergone;
86a88
> .providergone = g_disk_providergone,
489a492,497
> /*
> * We get this callback after all of the consumers have gone away, and just
> * before the provider is freed. If the disk driver provided a d_gone
> * callback, let them know that it is okay to free resources -- they won't
> * be getting any more accesses from GEOM.
> */
490a499,511
> g_disk_providergone(struct g_provider *pp)
> {
> struct disk *dp;
> struct g_disk_softc *sc;
>
> sc = (struct g_disk_softc *)pp->geom->softc;
> dp = sc->dp;
>
> if (dp->d_gone != NULL)
> dp->d_gone(dp);
> }
>
> static void
553c574
< if (version != DISK_VERSION_00 && version != DISK_VERSION_01) {
---
> if (version != DISK_VERSION_02) {
< __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 227309 2011-11-07 15:43:11Z ed $");
---
> __FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 237518 2012-06-24 04:29:03Z ken $");
77a78
> static g_provgone_t g_disk_providergone;
86a88
> .providergone = g_disk_providergone,
489a492,497
> /*
> * We get this callback after all of the consumers have gone away, and just
> * before the provider is freed. If the disk driver provided a d_gone
> * callback, let them know that it is okay to free resources -- they won't
> * be getting any more accesses from GEOM.
> */
490a499,511
> g_disk_providergone(struct g_provider *pp)
> {
> struct disk *dp;
> struct g_disk_softc *sc;
>
> sc = (struct g_disk_softc *)pp->geom->softc;
> dp = sc->dp;
>
> if (dp->d_gone != NULL)
> dp->d_gone(dp);
> }
>
> static void
553c574
< if (version != DISK_VERSION_00 && version != DISK_VERSION_01) {
---
> if (version != DISK_VERSION_02) {