[Midnightbsd-cvs] src [9043] trunk/sys/geom: fix orphan methods

[laffer1 at midnightbsd.org]

Revision: 9043
          http://svnweb.midnightbsd.org/src/?rev=9043
Author:   laffer1
Date:     2016-10-01 05:57:38 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
fix orphan methods

Modified Paths:
--------------
    trunk/sys/geom/bde/g_bde.c
    trunk/sys/geom/geom_aes.c
    trunk/sys/geom/geom_slice.c
    trunk/sys/geom/uncompress/g_uncompress.c
    trunk/sys/geom/uzip/g_uzip.c

Modified: trunk/sys/geom/bde/g_bde.c
===================================================================
--- trunk/sys/geom/bde/g_bde.c	2016-10-01 09:57:20 UTC (rev 9042)
+++ trunk/sys/geom/bde/g_bde.c	2016-10-01 09:57:38 UTC (rev 9043)
@@ -78,19 +78,15 @@
 	struct g_geom *gp;
 	struct g_provider *pp;
 	struct g_bde_softc *sc;
-	int error;
 
 	g_trace(G_T_TOPOLOGY, "g_bde_orphan(%p/%s)", cp, cp->provider->name);
 	g_topology_assert();
-	KASSERT(cp->provider->error != 0,
-		("g_bde_orphan with error == 0"));
 
 	gp = cp->geom;
 	sc = gp->softc;
 	gp->flags |= G_GEOM_WITHER;
-	error = cp->provider->error;
 	LIST_FOREACH(pp, &gp->provider, provider)
-		g_orphan_provider(pp, error);
+		g_orphan_provider(pp, ENXIO);
 	bzero(sc, sizeof(struct g_bde_softc));	/* destroy evidence */
 	return;
 }

Modified: trunk/sys/geom/geom_aes.c
===================================================================
--- trunk/sys/geom/geom_aes.c	2016-10-01 09:57:20 UTC (rev 9042)
+++ trunk/sys/geom/geom_aes.c	2016-10-01 09:57:38 UTC (rev 9043)
@@ -242,12 +242,10 @@
 
 	g_trace(G_T_TOPOLOGY, "g_aes_orphan(%p/%s)", cp, cp->provider->name);
 	g_topology_assert();
-	KASSERT(cp->provider->error != 0,
-		("g_aes_orphan with error == 0"));
 
 	gp = cp->geom;
 	sc = gp->softc;
-	g_wither_geom(gp, cp->provider->error);
+	g_wither_geom(gp, ENXIO);
 	bzero(sc, sizeof(struct g_aes_softc));	/* destroy evidence */
 	g_free(sc);
 	return;

Modified: trunk/sys/geom/geom_slice.c
===================================================================
--- trunk/sys/geom/geom_slice.c	2016-10-01 09:57:20 UTC (rev 9042)
+++ trunk/sys/geom/geom_slice.c	2016-10-01 09:57:38 UTC (rev 9043)
@@ -523,10 +523,8 @@
 
 	g_trace(G_T_TOPOLOGY, "g_slice_orphan(%p/%s)", cp, cp->provider->name);
 	g_topology_assert();
-	KASSERT(cp->provider->error != 0,
-	    ("g_slice_orphan with error == 0"));
 
 	/* XXX: Not good enough we leak the softc and its suballocations */
 	g_slice_free(cp->geom->softc);
-	g_wither_geom(cp->geom, cp->provider->error);
+	g_wither_geom(cp->geom, ENXIO);
 }

Modified: trunk/sys/geom/uncompress/g_uncompress.c
===================================================================
--- trunk/sys/geom/uncompress/g_uncompress.c	2016-10-01 09:57:20 UTC (rev 9042)
+++ trunk/sys/geom/uncompress/g_uncompress.c	2016-10-01 09:57:38 UTC (rev 9043)
@@ -406,13 +406,11 @@
 	g_trace(G_T_TOPOLOGY, "%s(%p/%s)", __func__, cp,
 		cp->provider->name);
 	g_topology_assert();
-	KASSERT(cp->provider->error != 0,
-		("g_uncompress_orphan with error == 0"));
 
 	gp = cp->geom;
 	g_uncompress_softc_free(gp->softc, gp);
 	gp->softc = NULL;
-	g_wither_geom(gp, cp->provider->error);
+	g_wither_geom(gp, ENXIO);
 }
 
 static int

Modified: trunk/sys/geom/uzip/g_uzip.c
===================================================================
--- trunk/sys/geom/uzip/g_uzip.c	2016-10-01 09:57:20 UTC (rev 9042)
+++ trunk/sys/geom/uzip/g_uzip.c	2016-10-01 09:57:38 UTC (rev 9043)
@@ -314,13 +314,11 @@
 
 	g_trace(G_T_TOPOLOGY, "g_uzip_orphan(%p/%s)", cp, cp->provider->name);
 	g_topology_assert();
-	KASSERT(cp->provider->error != 0,
-		("g_uzip_orphan with error == 0"));
 
 	gp = cp->geom;
 	g_uzip_softc_free(gp->softc, gp);
 	gp->softc = NULL;
-	g_wither_geom(gp, cp->provider->error);
+	g_wither_geom(gp, ENXIO);
 }
 
 static int