From owner-svn-src-stable@FreeBSD.ORG  Thu Apr  9 10:08:50 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 910248DB;
 Thu,  9 Apr 2015 10:08:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B93AC94;
 Thu,  9 Apr 2015 10:08:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39A8oL9011439;
 Thu, 9 Apr 2015 10:08:50 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39A8ob0011438;
 Thu, 9 Apr 2015 10:08:50 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201504091008.t39A8ob0011438@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 9 Apr 2015 10:08:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r281302 - stable/9/sys/geom
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Apr 2015 10:08:50 -0000

Author: mav
Date: Thu Apr  9 10:08:49 2015
New Revision: 281302
URL: https://svnweb.freebsd.org/changeset/base/281302

Log:
  MFC r280686: Report withered providers as such alike to GEOMs.

Modified:
  stable/9/sys/geom/geom_dump.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/geom_dump.c
==============================================================================
--- stable/9/sys/geom/geom_dump.c	Thu Apr  9 10:08:11 2015	(r281301)
+++ stable/9/sys/geom/geom_dump.c	Thu Apr  9 10:08:49 2015	(r281302)
@@ -214,7 +214,9 @@ g_conf_provider(struct sbuf *sb, struct 
 	sbuf_printf(sb, "\t  <sectorsize>%u</sectorsize>\n", pp->sectorsize);
 	sbuf_printf(sb, "\t  <stripesize>%u</stripesize>\n", pp->stripesize);
 	sbuf_printf(sb, "\t  <stripeoffset>%u</stripeoffset>\n", pp->stripeoffset);
-	if (pp->geom->flags & G_GEOM_WITHER)
+	if (pp->flags & G_PF_WITHER)
+		sbuf_printf(sb, "\t  <wither/>\n");
+	else if (pp->geom->flags & G_GEOM_WITHER)
 		;
 	else if (pp->geom->dumpconf != NULL) {
 		sbuf_printf(sb, "\t  <config>\n");