svn commit: r242226 - stable/9/sys/geom/part

[Andriy Gapon]

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);
 }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"