From owner-svn-src-all@FreeBSD.ORG  Mon Apr 15 15:55:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 42ED2D90;
 Mon, 15 Apr 2013 15:55:41 +0000 (UTC)
 (envelope-from ivoras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 359819D0;
 Mon, 15 Apr 2013 15:55:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3FFtfFv075595;
 Mon, 15 Apr 2013 15:55:41 GMT (envelope-from ivoras@svn.freebsd.org)
Received: (from ivoras@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3FFtebI075592;
 Mon, 15 Apr 2013 15:55:40 GMT (envelope-from ivoras@svn.freebsd.org)
Message-Id: <201304151555.r3FFtebI075592@svn.freebsd.org>
From: Ivan Voras <ivoras@FreeBSD.org>
Date: Mon, 15 Apr 2013 15:55:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249507 - head/sys/geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Apr 2013 15:55:41 -0000

Author: ivoras
Date: Mon Apr 15 15:55:40 2013
New Revision: 249507
URL: http://svnweb.freebsd.org/changeset/base/249507

Log:
  Introduce a symbol for the GEOM class name instead of using the ad-hoc string
  constant.

Modified:
  head/sys/geom/geom_disk.c
  head/sys/geom/geom_disk.h
  head/sys/geom/geom_dump.c

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Mon Apr 15 13:00:42 2013	(r249506)
+++ head/sys/geom/geom_disk.c	Mon Apr 15 15:55:40 2013	(r249507)
@@ -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,

Modified: head/sys/geom/geom_disk.h
==============================================================================
--- head/sys/geom/geom_disk.h	Mon Apr 15 13:00:42 2013	(r249506)
+++ head/sys/geom/geom_disk.h	Mon Apr 15 15:55:40 2013	(r249507)
@@ -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 *);

Modified: head/sys/geom/geom_dump.c
==============================================================================
--- head/sys/geom/geom_dump.c	Mon Apr 15 13:00:42 2013	(r249506)
+++ head/sys/geom/geom_dump.c	Mon Apr 15 15:55:40 2013	(r249507)
@@ -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);