svn commit: r242227 - stable/8/sys/geom/part

[Andriy Gapon]

Author: avg
Date: Sun Oct 28 15:43:13 2012
New Revision: 242227
URL: http://svn.freebsd.org/changeset/base/242227

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

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

Modified: stable/8/sys/geom/part/g_part.c
==============================================================================
--- stable/8/sys/geom/part/g_part.c	Sun Oct 28 15:41:14 2012	(r242226)
+++ stable/8/sys/geom/part/g_part.c	Sun Oct 28 15:43:13 2012	(r242227)
@@ -1809,7 +1809,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);
 	}
 
@@ -1869,7 +1872,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);
 }