==== //depot/users/kenm/FreeBSD-test2/sys/geom/geom_disk.c#7 - /usr/home/kenm/perforce4/kenm/FreeBSD-test2/sys/geom/geom_disk.c ====
*** /tmp/tmp.75357.20	Tue Jun 26 20:25:44 2012
--- /usr/home/kenm/perforce4/kenm/FreeBSD-test2/sys/geom/geom_disk.c	Tue Jun 26 20:25:29 2012
***************
*** 502,507 ****
--- 502,515 ----
  	struct g_disk_softc *sc;
  
  	sc = (struct g_disk_softc *)pp->geom->softc;
+ 
+ 	/*
+ 	 * If the softc is already NULL, then we've probably been through
+ 	 * g_disk_destroy already; there is nothing for us to do anyway.
+ 	 */
+ 	if (sc == NULL)
+ 		return;
+ 
  	dp = sc->dp;
  
  	if (dp->d_gone != NULL)