summaryrefslogtreecommitdiffstats
path: root/sys/geom
diff options
context:
space:
mode:
authorivoras <ivoras@FreeBSD.org>2013-04-15 15:55:40 +0000
committerivoras <ivoras@FreeBSD.org>2013-04-15 15:55:40 +0000
commit4893ec0b76fa0d03524f1cd3cebbd1c9a143d2f7 (patch)
treeb5a58dbd3c3e9f960af5c3e04ca74ccba8d72dfc /sys/geom
parentd9c22bdbc9c9f5cdee2a672851e8f18a8e41fad8 (diff)
downloadFreeBSD-src-4893ec0b76fa0d03524f1cd3cebbd1c9a143d2f7.zip
FreeBSD-src-4893ec0b76fa0d03524f1cd3cebbd1c9a143d2f7.tar.gz
Introduce a symbol for the GEOM class name instead of using the ad-hoc string
constant.
Diffstat (limited to 'sys/geom')
-rw-r--r--sys/geom/geom_disk.c2
-rw-r--r--sys/geom/geom_disk.h2
-rw-r--r--sys/geom/geom_dump.c3
3 files changed, 5 insertions, 2 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index c71e6ec..7292ae3 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 246fc49..6d10a07 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 6f678cf..d5e1f30 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);
OpenPOWER on IntegriCloud