From owner-svn-src-all@FreeBSD.ORG  Mon Aug 20 16:55:55 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 C35F4106564A;
	Mon, 20 Aug 2012 16:55:55 +0000 (UTC)
	(envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ADE3E8FC0A;
	Mon, 20 Aug 2012 16:55:55 +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 q7KGttmg064500;
	Mon, 20 Aug 2012 16:55:55 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KGttpD064498;
	Mon, 20 Aug 2012 16:55:55 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201208201655.q7KGttpD064498@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 20 Aug 2012 16:55:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239449 - releng/9.1/sys/geom/virstor
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: Mon, 20 Aug 2012 16:55:55 -0000

Author: jimharris
Date: Mon Aug 20 16:55:55 2012
New Revision: 239449
URL: http://svn.freebsd.org/changeset/base/239449

Log:
  MFC r239021:
  
  In virstor_ctl_stop(), check for a valid softc before trying to update
  metadata.
  
  Approved by: re (kib)

Modified:
  releng/9.1/sys/geom/virstor/g_virstor.c
Directory Properties:
  releng/9.1/sys/   (props changed)

Modified: releng/9.1/sys/geom/virstor/g_virstor.c
==============================================================================
--- releng/9.1/sys/geom/virstor/g_virstor.c	Mon Aug 20 16:45:46 2012	(r239448)
+++ releng/9.1/sys/geom/virstor/g_virstor.c	Mon Aug 20 16:55:55 2012	(r239449)
@@ -234,6 +234,12 @@ virstor_ctl_stop(struct gctl_req *req, s
 			return;
 		}
 		sc = virstor_find_geom(cp, name);
+		if (sc == NULL) {
+			gctl_error(req, "Don't know anything about '%s'", name);
+			g_topology_unlock();
+			return;
+		}
+
 		LOG_MSG(LVL_INFO, "Stopping %s by the userland command",
 		    sc->geom->name);
 		update_metadata(sc);