From owner-svn-src-stable@FreeBSD.ORG  Fri Apr  5 10:30:37 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EDE95BEF;
 Fri,  5 Apr 2013 10:30:37 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E0B71DCA;
 Fri,  5 Apr 2013 10:30:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35AUbjV041217;
 Fri, 5 Apr 2013 10:30:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35AUb7H041216;
 Fri, 5 Apr 2013 10:30:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304051030.r35AUb7H041216@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 5 Apr 2013 10:30:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r249147 - stable/9/sys/geom
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Apr 2013 10:30:38 -0000

Author: mav
Date: Fri Apr  5 10:30:37 2013
New Revision: 249147
URL: http://svnweb.freebsd.org/changeset/base/249147

Log:
  MFC r228204:
  Close race between geom destruction on g_vfs_close() when softc destroyed
  and g_vfs_orphan() call that tries to access softc, intruced at r227015.

Modified:
  stable/9/sys/geom/geom_vfs.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/geom_vfs.c
==============================================================================
--- stable/9/sys/geom/geom_vfs.c	Fri Apr  5 10:29:14 2013	(r249146)
+++ stable/9/sys/geom/geom_vfs.c	Fri Apr  5 10:30:37 2013	(r249147)
@@ -214,8 +214,10 @@ g_vfs_orphan(struct g_consumer *cp)
 	g_topology_assert();
 
 	gp = cp->geom;
-	sc = gp->softc;
 	g_trace(G_T_TOPOLOGY, "g_vfs_orphan(%p(%s))", cp, gp->name);
+	sc = gp->softc;
+	if (sc == NULL)
+		return;
 	mtx_lock(&sc->sc_mtx);
 	sc->sc_orphaned = 1;
 	destroy = (sc->sc_active == 0);