From owner-svn-src-all@FreeBSD.ORG  Sat Sep 22 12:41:50 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2F1421065672;
	Sat, 22 Sep 2012 12:41:50 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D17688FC14;
	Sat, 22 Sep 2012 12:41:49 +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 q8MCfn87067939;
	Sat, 22 Sep 2012 12:41:49 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8MCfnhJ067937;
	Sat, 22 Sep 2012 12:41:49 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201209221241.q8MCfnhJ067937@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 22 Sep 2012 12:41:49 +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: r240822 - 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: Sat, 22 Sep 2012 12:41:50 -0000

Author: pjd
Date: Sat Sep 22 12:41:49 2012
New Revision: 240822
URL: http://svn.freebsd.org/changeset/base/240822

Log:
  Use the topology lock to protect list of providers while withering them.
  It is possible that provider is destroyed while we are iterating over the
  list.
  
  Reported by:	Brian Parkison <parkison@panzura.com>
  Discussed with:	phk
  MFC after:	1 week

Modified:
  head/sys/geom/geom_disk.c

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Sat Sep 22 12:40:52 2012	(r240821)
+++ head/sys/geom/geom_disk.c	Sat Sep 22 12:41:49 2012	(r240822)
@@ -635,10 +635,13 @@ disk_gone(struct disk *dp)
 	struct g_geom *gp;
 	struct g_provider *pp;
 
+	g_topology_lock();
 	gp = dp->d_geom;
-	if (gp != NULL)
+	if (gp != NULL) {
 		LIST_FOREACH(pp, &gp->provider, provider)
 			g_wither_provider(pp, ENXIO);
+	}
+	g_topology_unlock();
 }
 
 void