From owner-freebsd-current@FreeBSD.ORG  Tue Jul  8 13:46:52 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 C37BA37B401
	for <current@freebsd.org>; Tue,  8 Jul 2003 13:46:52 -0700 (PDT)
Received: from area51.slashnet.org (area51.slashnet.org [209.150.101.138])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4077943F75
	for <current@freebsd.org>; Tue,  8 Jul 2003 13:46:52 -0700 (PDT)
	(envelope-from smkelly@FreeBSD.org)
Received: from edgemaster.zombie.org (ip68-13-71-251.om.om.cox.net
	[68.13.71.251])	by area51.slashnet.org (Postfix) with ESMTP
	id 0780949F9F; Tue,  8 Jul 2003 16:46:49 -0400 (EDT)
Received: by edgemaster.zombie.org (Postfix, from userid 1001)
	id 7B98539839; Tue,  8 Jul 2003 15:46:49 -0500 (CDT)
Date: Tue, 8 Jul 2003 15:46:49 -0500
From: Sean Kelly <smkelly@FreeBSD.org>
To: Poul-Henning Kamp <phk@phk.freebsd.dk>
Message-ID: <20030708204649.GA19571@edgemaster.zombie.org>
References: <3F0B28F1.4060702@t-online.de>
	<3339.1057696547@critter.freebsd.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <3339.1057696547@critter.freebsd.dk>
User-Agent: Mutt/1.5.4i
cc: "D. Rock" <D.Rock@t-online.de>
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:46:53 -0000

On Tue, Jul 08, 2003 at 10:35:47PM +0200, Poul-Henning Kamp wrote:
> 
> Can you try this patch ?

...
> 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
...
> @@ -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");
...

Should that be "else if ((cp->geom->dumpconf != NULL)"? I don't know the
code, but I'm basing this question off of what is below in the patch:

> @@ -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) {  // <---------- HERE
>  		sbuf_printf(sb, "\t  <config>\n");
>  		pp->geom->dumpconf(sb, "\t    ", pp->geom, NULL, pp);
>  		sbuf_printf(sb, "\t  </config>\n");

-- 
Sean Kelly          | PGP KeyID: D2E5E296
smkelly@FreeBSD.org | http://www.sean-kelly.org/