From owner-freebsd-current@FreeBSD.ORG  Tue Jul  8 13:36:08 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 168F837B401
	for <current@freebsd.org>; Tue,  8 Jul 2003 13:36:08 -0700 (PDT)
Received: from phk.freebsd.dk (phk.freebsd.dk [212.242.86.175])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1E15D43F75
	for <current@freebsd.org>; Tue,  8 Jul 2003 13:36:07 -0700 (PDT)
	(envelope-from phk@phk.freebsd.dk)
Received: from critter.freebsd.dk (port757.uc1-esp.isdn-lan.cybercity.dk
	[212.242.98.245])
	by phk.freebsd.dk (8.12.8/8.12.8) with ESMTP id h68KZxV3028475;
	Tue, 8 Jul 2003 20:36:00 GMT	(envelope-from phk@phk.freebsd.dk)
Received: from critter.freebsd.dk (localhost [127.0.0.1])
	by critter.freebsd.dk (8.12.9/8.12.9) with ESMTP id h68KZlvb003340;
	Tue, 8 Jul 2003 22:35:55 +0200 (CEST)
	(envelope-from phk@phk.freebsd.dk)
To: D.Rock@t-online.de (D. Rock)
From: "Poul-Henning Kamp" <phk@phk.freebsd.dk>
In-Reply-To: Your message of "Tue, 08 Jul 2003 22:26:25 +0200."
             <3F0B28F1.4060702@t-online.de> 
Date: Tue, 08 Jul 2003 22:35:47 +0200
Message-ID: <3339.1057696547@critter.freebsd.dk>
cc: current@freebsd.org
Subject: Re: GEOM panic 
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jul 2003 20:36:08 -0000


Can you try this patch ?


Index: geom_dump.c
===================================================================
RCS file: /home/ncvs/src/sys/geom/geom_dump.c,v
retrieving revision 1.28
diff -u -r1.28 geom_dump.c
--- geom_dump.c	11 Jun 2003 06:49:15 -0000	1.28
+++ geom_dump.c	8 Jul 2003 20:00:45 -0000
@@ -114,6 +114,8 @@
 	struct g_provider *pp;
 	struct g_consumer *cp;
 
+	if (gp->flags & G_GEOM_WITHER)
+		return;
 	LIST_FOREACH(pp, &gp->provider, provider) {
 		sbuf_printf(sb, "%d %s %s %ju %u", level, gp->class->name,
 		    pp->name, (uintmax_t)pp->mediasize, pp->sectorsize);
@@ -162,6 +164,8 @@
 		sbuf_printf(sb, "\t  <provider ref=\"%p\"/>\n", cp->provider);
 	sbuf_printf(sb, "\t  <mode>r%dw%de%d</mode>\n",
 	    cp->acr, cp->acw, cp->ace);
+	if (cp->geom->flags & G_GEOM_WITHER)
+		;
 	if (cp->geom->dumpconf != NULL) {
 		sbuf_printf(sb, "\t  <config>\n");
 		cp->geom->dumpconf(sb, "\t    ", cp->geom, cp, NULL);
@@ -182,7 +186,9 @@
 	sbuf_printf(sb, "\t  <mediasize>%jd</mediasize>\n",
 	    (intmax_t)pp->mediasize);
 	sbuf_printf(sb, "\t  <sectorsize>%u</sectorsize>\n", pp->sectorsize);
-	if (pp->geom->dumpconf != NULL) {
+	if (pp->geom->flags & G_GEOM_WITHER)
+		;
+	else if (pp->geom->dumpconf != NULL) {
 		sbuf_printf(sb, "\t  <config>\n");
 		pp->geom->dumpconf(sb, "\t    ", pp->geom, NULL, pp);
 		sbuf_printf(sb, "\t  </config>\n");
@@ -201,7 +207,9 @@
 	sbuf_printf(sb, "      <class ref=\"%p\"/>\n", gp->class);
 	sbuf_printf(sb, "      <name>%s</name>\n", gp->name);
 	sbuf_printf(sb, "      <rank>%d</rank>\n", gp->rank);
-	if (gp->dumpconf != NULL) {
+	if (gp->flags & G_GEOM_WITHER)
+		sbuf_printf(sb, "      <wither/>\n");
+	else if (gp->dumpconf != NULL) {
 		sbuf_printf(sb, "      <config>\n");
 		gp->dumpconf(sb, "\t", gp, NULL, NULL);
 		sbuf_printf(sb, "      </config>\n");

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk@FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.