Date: Tue, 08 Jul 2003 22:35:47 +0200 From: "Poul-Henning Kamp" <phk@phk.freebsd.dk> To: D.Rock@t-online.de (D. Rock) Cc: current@freebsd.org Subject: Re: GEOM panic Message-ID: <3339.1057696547@critter.freebsd.dk> In-Reply-To: Your message of "Tue, 08 Jul 2003 22:26:25 %2B0200." <3F0B28F1.4060702@t-online.de>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3339.1057696547>