From owner-svn-src-all@FreeBSD.ORG  Wed Jun 27 16:05:10 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90A3D106564A;
	Wed, 27 Jun 2012 16:05:10 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C3278FC14;
	Wed, 27 Jun 2012 16:05:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5RG5Asv019342;
	Wed, 27 Jun 2012 16:05:10 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5RG5AqG019340;
	Wed, 27 Jun 2012 16:05:10 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201206271605.q5RG5AqG019340@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Wed, 27 Jun 2012 16:05:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237648 - head/sys/geom
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jun 2012 16:05:10 -0000

Author: ken
Date: Wed Jun 27 16:05:09 2012
New Revision: 237648
URL: http://svn.freebsd.org/changeset/base/237648

Log:
  In g_disk_providergone(), don't continue if the softc is NULL.  This may be
  the case if we've already gone through g_disk_destroy().
  
  Reported by:	Michael Butler <imb@protected-networks.net>
  MFC after:	3 days

Modified:
  head/sys/geom/geom_disk.c

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Wed Jun 27 15:55:34 2012	(r237647)
+++ head/sys/geom/geom_disk.c	Wed Jun 27 16:05:09 2012	(r237648)
@@ -502,6 +502,14 @@ g_disk_providergone(struct g_provider *p
 	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)