35c35
< * $FreeBSD: head/sys/geom/geom_subr.c 92108 2002-03-11 21:42:35Z phk $
---
> * $FreeBSD: head/sys/geom/geom_subr.c 93248 2002-03-26 21:40:06Z phk $
63c63
< struct method_list_head g_methods = LIST_HEAD_INITIALIZER(g_methods);
---
> struct class_list_head g_classs = LIST_HEAD_INITIALIZER(g_classs);
71c71
< g_add_method(struct g_method *mp)
---
> g_add_class(struct g_class *mp)
79c79
< g_trace(G_T_TOPOLOGY, "g_add_method(%s)", mp->name);
---
> g_trace(G_T_TOPOLOGY, "g_add_class(%s)", mp->name);
81c81
< LIST_INSERT_HEAD(&g_methods, mp, method);
---
> LIST_INSERT_HEAD(&g_classs, mp, class);
83c83
< g_post_event(EV_NEW_METHOD, mp, NULL, NULL, NULL);
---
> g_post_event(EV_NEW_CLASS, mp, NULL, NULL, NULL);
88c88
< g_new_geomf(struct g_method *mp, char *fmt, ...)
---
> g_new_geomf(struct g_class *mp, char *fmt, ...)
103c103
< gp->method = mp;
---
> gp->class = mp;
138,139c138,139
< KASSERT(gp->method->orphan != NULL,
< ("g_new_consumer on method(%s) without orphan", gp->method->name));
---
> KASSERT(gp->class->orphan != NULL,
> ("g_new_consumer on class(%s) without orphan", gp->class->name));
380c380
< KASSERT(pp->geom->method->access != NULL, ("NULL method->access"));
---
> KASSERT(pp->geom->class->access != NULL, ("NULL class->access"));
383c383
< * If our method cares about being spoiled, and we have been, we
---
> * If our class cares about being spoiled, and we have been, we
433c433
< error = pp->geom->method->access(pp, dcr, dcw, dce);
---
> error = pp->geom->class->access(pp, dcr, dcw, dce);
552,553c552,553
< static struct g_method *
< g_method_by_name(char *name)
---
> static struct g_class *
> g_class_by_name(char *name)
555c555
< struct g_method *mp;
---
> struct g_class *mp;
557c557
< g_trace(G_T_TOPOLOGY, "g_method_by_name(%s)", name);
---
> g_trace(G_T_TOPOLOGY, "g_class_by_name(%s)", name);
559c559
< LIST_FOREACH(mp, &g_methods, method)
---
> LIST_FOREACH(mp, &g_classs, class)
566c566
< g_create_geomf(char *method, struct g_provider *pp, char *fmt, ...)
---
> g_create_geomf(char *class, struct g_provider *pp, char *fmt, ...)
571c571
< struct g_method *mp;
---
> struct g_class *mp;
574c574
< g_trace(G_T_TOPOLOGY, "g_create_geom(%s, %p(%s))", method,
---
> g_trace(G_T_TOPOLOGY, "g_create_geom(%s, %p(%s))", class,
578c578
< mp = g_method_by_name(method);
---
> mp = g_class_by_name(class);
603c603
< g_insert_geom(char *method, struct g_consumer *cp)
---
> g_insert_geom(char *class, struct g_consumer *cp)
605c605
< struct g_method *mp;
---
> struct g_class *mp;
611c611
< g_trace(G_T_TOPOLOGY, "g_insert_geomf(%s, %p)", method, cp);
---
> g_trace(G_T_TOPOLOGY, "g_insert_geomf(%s, %p)", class, cp);
615c615
< mp = g_method_by_name(method);
---
> mp = g_class_by_name(class);