summaryrefslogtreecommitdiffstats
path: root/sys/geom/concat/g_concat.c
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2004-08-09 11:14:25 +0000
committerpjd <pjd@FreeBSD.org>2004-08-09 11:14:25 +0000
commit8da7f212eb86a785be5e723cb0de5d968c9b159b (patch)
tree33baeacb69499603d7dcf852e68770fbdabcc1e0 /sys/geom/concat/g_concat.c
parent6a44735c94fea6d18675f2d972efa5c4afec0cf9 (diff)
downloadFreeBSD-src-8da7f212eb86a785be5e723cb0de5d968c9b159b.zip
FreeBSD-src-8da7f212eb86a785be5e723cb0de5d968c9b159b.tar.gz
Do not use g_wither_geom(9). I doesn't work in the way which is expected
here anymore (after g_wither_washer() was introduced), i.e. geom and consumer will not be immediately destroyed if possible.
Diffstat (limited to 'sys/geom/concat/g_concat.c')
-rw-r--r--sys/geom/concat/g_concat.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index 943ac2b..480b30d 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -552,9 +552,10 @@ g_concat_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
gp->orphan = g_concat_orphan;
cp = g_new_consumer(gp);
g_attach(cp, pp);
-
error = g_concat_read_metadata(cp, &md);
- g_wither_geom(gp, ENXIO);
+ g_detach(cp);
+ g_destroy_consumer(cp);
+ g_destroy_geom(gp);
if (error != 0)
return (NULL);
gp = NULL;
OpenPOWER on IntegriCloud