diff options
| author | phk <phk@FreeBSD.org> | 2003-05-02 06:36:14 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-05-02 06:36:14 +0000 |
| commit | 4c52a206d24421e6c4708baeba60bb6f9b88ebb4 (patch) | |
| tree | f30ff1854b1e718bcb5d94f16dcee4c13b5afe1a /sys/geom/geom_subr.c | |
| parent | 6b0e95eef5a40043ddb0bb6618b23b20c6da7ab4 (diff) | |
| download | FreeBSD-src-4c52a206d24421e6c4708baeba60bb6f9b88ebb4.zip FreeBSD-src-4c52a206d24421e6c4708baeba60bb6f9b88ebb4.tar.gz | |
Use g_slice_spoiled() rather than g_std_spoiled().
Remember to free the buffer we got from g_read_data().
Diffstat (limited to 'sys/geom/geom_subr.c')
| -rw-r--r-- | sys/geom/geom_subr.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index d45dd2b..ce2d876 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -237,7 +237,9 @@ g_new_provider_event(void *arg, int flag) struct g_class *mp; struct g_provider *pp; struct g_consumer *cp; + struct g_geom *gp; int i; + u_long l1, l2; g_topology_assert(); if (flag == EV_CANCEL) @@ -254,7 +256,12 @@ g_new_provider_event(void *arg, int flag) i = 0; if (!i) continue; - mp->taste(mp, pp, 0); + l1 = M_GEOM[0].ks_memuse; + gp = mp->taste(mp, pp, 0); + l2 = M_GEOM[0].ks_memuse; + if (l1 != l2) + printf("%s %p %lu %lu -> %lu\n", + mp->name, gp, l1, l2, l2 - l1); g_topology_assert(); } } @@ -595,20 +602,10 @@ g_std_done(struct bio *bp) void g_std_spoiled(struct g_consumer *cp) { - struct g_geom *gp; - struct g_provider *pp; g_trace(G_T_TOPOLOGY, "g_std_spoiled(%p)", cp); g_topology_assert(); - g_detach(cp); - gp = cp->geom; - LIST_FOREACH(pp, &gp->provider, provider) - g_orphan_provider(pp, ENXIO); - g_destroy_consumer(cp); - if (LIST_EMPTY(&gp->provider) && LIST_EMPTY(&gp->consumer)) - g_destroy_geom(gp); - else - gp->flags |= G_GEOM_WITHER; + g_wither_geom(cp->geom, ENXIO); } /* |
