summaryrefslogtreecommitdiffstats
path: root/sys/geom/bde
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2012-07-07 17:09:44 +0000
committertrasz <trasz@FreeBSD.org>2012-07-07 17:09:44 +0000
commitc29dc3c9613cfe4e9eb56a0a18c9bf11bd02992b (patch)
tree1b1be4494336dbf14054f0f13f4b81b948f45569 /sys/geom/bde
parent2a7f91bf1afb27f4cfcf5f29aded548db4a01a18 (diff)
downloadFreeBSD-src-c29dc3c9613cfe4e9eb56a0a18c9bf11bd02992b.zip
FreeBSD-src-c29dc3c9613cfe4e9eb56a0a18c9bf11bd02992b.tar.gz
Fix orphan() methods of several GEOM classes to not assume that there
is an error set on the provider. With GEOM resizing, class can become orphaned when it doesn't implement resize() method and the provider size decreases. Reviewed by: mav Sponsored by: FreeBSD Foundation
Diffstat (limited to 'sys/geom/bde')
-rw-r--r--sys/geom/bde/g_bde.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index bd4b107..99064f4 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -77,19 +77,15 @@ g_bde_orphan(struct g_consumer *cp)
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;
}
OpenPOWER on IntegriCloud