Cave in to tradition and rename "methods" to "classes".

1 files changed, 7 insertions, 7 deletions

diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index 39a2787..3ed9bc5 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -57,7 +57,7 @@
 #include <geom/geom_slice.h>
 #include <machine/endian.h>
 
-#define BSD_METHOD_NAME "SUNLABEL-method"
+#define BSD_CLASS_NAME "SUNLABEL-class"
 
 struct g_sunlabel_softc {
 	int foo;
@@ -84,7 +84,7 @@ g_sunlabel_dumpconf(struct sbuf *sb, char *indent, struct g_geom *gp, struct g_c
 }
 
 static struct g_geom *
-g_sunlabel_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp, int flags)
+g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, struct thread *tp, int flags)
 {
 	struct g_geom *gp;
 	struct g_consumer *cp;
@@ -98,7 +98,7 @@ g_sunlabel_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp,
 	g_trace(G_T_TOPOLOGY, "g_sunlabel_taste(%s,%s)", mp->name, pp->name);
 	g_topology_assert();
 	if (flags == G_TF_NORMAL &&
-	    !strcmp(pp->geom->method->name, BSD_METHOD_NAME))
+	    !strcmp(pp->geom->class->name, BSD_CLASS_NAME))
 		return (NULL);
 	gp = g_slice_new(mp, 8, pp, &cp, &ms, sizeof *ms, g_sunlabel_start);
 	if (gp == NULL)
@@ -184,13 +184,13 @@ g_sunlabel_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp,
 	return (NULL);
 }
 
-static struct g_method g_sunlabel_method = {
-	BSD_METHOD_NAME,
+static struct g_class g_sunlabel_class = {
+	BSD_CLASS_NAME,
 	g_sunlabel_taste,
 	g_slice_access,
 	g_slice_orphan,
 	NULL,
-	G_METHOD_INITSTUFF
+	G_CLASS_INITSTUFF
 };
 
-DECLARE_GEOM_METHOD(g_sunlabel_method, g_sunlabel);
+DECLARE_GEOM_CLASS(g_sunlabel_class, g_sunlabel);