From 252c094e534166b9f773e69b959bdbecebfcda56 Mon Sep 17 00:00:00 2001
From: Ivan Voras <ivoras@FreeBSD.org>
Date: Mon, 15 Apr 2013 15:55:40 +0000
Subject: [PATCH] Introduce a symbol for the GEOM class name instead of using
 the ad-hoc string constant.

---
 sys/geom/geom_disk.c | 2 +-
 sys/geom/geom_disk.h | 2 ++
 sys/geom/geom_dump.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index c71e6eccd87..7292ae39e58 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -75,7 +75,7 @@ static g_dumpconf_t g_disk_dumpconf;
 static g_provgone_t g_disk_providergone;
 
 static struct g_class g_disk_class = {
-	.name = "DISK",
+	.name = G_DISK_CLASS_NAME,
 	.version = G_VERSION,
 	.start = g_disk_start,
 	.access = g_disk_access,
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index 246fc497e7b..6d10a075885 100644
--- a/sys/geom/geom_disk.h
+++ b/sys/geom/geom_disk.h
@@ -44,6 +44,8 @@
 #include <sys/_mutex.h>
 #include <sys/disk.h>
 
+#define G_DISK_CLASS_NAME	"DISK"
+
 struct disk;
 
 typedef	int	disk_open_t(struct disk *);
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index 6f678cf45a7..d5e1f30b9f2 100644
--- a/sys/geom/geom_dump.c
+++ b/sys/geom/geom_dump.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <geom/geom.h>
 #include <geom/geom_int.h>
+#include <geom/geom_disk.h>
 
 
 static void
@@ -146,7 +147,7 @@ g_conftxt(void *p, int flag)
 	sb = p;
 	g_topology_assert();
 	LIST_FOREACH(mp, &g_classes, class) {
-		if (!strcmp(mp->name, "DISK") || !strcmp(mp->name, "MD"))
+		if (!strcmp(mp->name, G_DISK_CLASS_NAME) || !strcmp(mp->name, "MD"))
 			g_conftxt_class(sb, mp);
 	}
 	sbuf_finish(sb);