From 45e43ab0e81f942643c94f98a1e9de187213fcc2 Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 25 Mar 2003 09:07:35 +0000 Subject: Remove unuse g_insert_geom(). --- sys/geom/geom.h | 1 - sys/geom/geom_subr.c | 38 -------------------------------------- 2 files changed, 39 deletions(-) diff --git a/sys/geom/geom.h b/sys/geom/geom.h index f6f2cdb..f07485a 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -235,7 +235,6 @@ int g_getattr__(const char *attr, struct g_consumer *cp, void *var, int len); int g_handleattr(struct bio *bp, const char *attribute, void *val, int len); int g_handleattr_int(struct bio *bp, const char *attribute, int val); int g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val); -struct g_geom * g_insert_geom(const char *class, struct g_consumer *cp); struct g_consumer * g_new_consumer(struct g_geom *gp); struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...); struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...); diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index f047b59..d9d548b 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -584,44 +584,6 @@ g_class_by_name(const char *name) return (NULL); } -struct g_geom * -g_insert_geom(const char *class, struct g_consumer *cp) -{ - struct g_class *mp; - struct g_geom *gp; - struct g_provider *pp, *pp2; - struct g_consumer *cp2; - int error; - - g_trace(G_T_TOPOLOGY, "g_insert_geomf(%s, %p)", class, cp); - g_topology_assert(); - KASSERT(cp->provider != NULL, ("g_insert_geomf but not attached")); - /* XXX: check for events ?? */ - mp = g_class_by_name(class); - if (mp == NULL) - return (NULL); - if (mp->config == NULL) - return (NULL); - pp = cp->provider; - gp = mp->taste(mp, pp, G_TF_TRANSPARENT); - if (gp == NULL) - return (NULL); - pp2 = LIST_FIRST(&gp->provider); - cp2 = LIST_FIRST(&gp->consumer); - cp2->acr += pp->acr; - cp2->acw += pp->acw; - cp2->ace += pp->ace; - pp2->acr += pp->acr; - pp2->acw += pp->acw; - pp2->ace += pp->ace; - LIST_REMOVE(cp, consumers); - LIST_INSERT_HEAD(&pp2->consumers, cp, consumers); - cp->provider = pp2; - error = redo_rank(gp); - KASSERT(error == 0, ("redo_rank failed in g_insert_geom")); - return (gp); -} - int g_getattr__(const char *attr, struct g_consumer *cp, void *var, int len) { -- cgit v1.1