From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 28 15:41:14 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D988B2B0;
 Sun, 28 Oct 2012 15:41:14 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id BA06E8FC08;
 Sun, 28 Oct 2012 15:41:14 +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 q9SFfEpw040457;
 Sun, 28 Oct 2012 15:41:14 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9SFfEb1040455;
 Sun, 28 Oct 2012 15:41:14 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201210281541.q9SFfEb1040455@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 28 Oct 2012 15:41:14 +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: r242226 - stable/9/sys/geom/part
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: Sun, 28 Oct 2012 15:41:15 -0000

Author: avg
Date: Sun Oct 28 15:41:14 2012
New Revision: 242226
URL: http://svn.freebsd.org/changeset/base/242226

Log:
  MFC r241296:  g_part_taste: directly destroy consumer and geom here, no
  need for withering

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

Modified: stable/9/sys/geom/part/g_part.c
==============================================================================
--- stable/9/sys/geom/part/g_part.c	Sun Oct 28 15:37:47 2012	(r242225)
+++ stable/9/sys/geom/part/g_part.c	Sun Oct 28 15:41:14 2012	(r242226)
@@ -1875,7 +1875,10 @@ g_part_taste(struct g_class *mp, struct 
 	if (error == 0)
 		error = g_access(cp, 1, 0, 0);
 	if (error != 0) {
-		g_part_wither(gp, error);
+		if (cp->provider)
+			g_detach(cp);
+		g_destroy_consumer(cp);
+		g_destroy_geom(gp);
 		return (NULL);
 	}
 
@@ -1935,7 +1938,9 @@ g_part_taste(struct g_class *mp, struct 
 	g_topology_lock();
 	root_mount_rel(rht);
 	g_access(cp, -1, 0, 0);
-	g_part_wither(gp, error);
+	g_detach(cp);
+	g_destroy_consumer(cp);
+	g_destroy_geom(gp);
 	return (NULL);
 }