svn commit: r269735 - stable/10/cddl/contrib/opensolaris/cmd/zpool

[Xin LI]

Author: delphij
Date: Fri Aug  8 19:11:23 2014
New Revision: 269735
URL: http://svnweb.freebsd.org/changeset/base/269735

Log:
  MFC r268621 (smh) + r268625:
  
  Don't report non-native block-size pools under zpool status -x
  
  zpool status -x is used to identify pools that are exhibiting
  errors or are otherwise unavailable, therefore non-native
  block-size pools shouldn't be reported.
  
  Also update man page to clarify other additional conditions
  which won't cause a pool to be displayed under zpool status -x.
  
  Sponsored by:   Multiplay

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Aug  8 19:06:24 2014	(r269734)
+++ stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Aug  8 19:11:23 2014	(r269735)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 28, 2014
+.Dd July 14, 2014
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -1664,7 +1664,8 @@ can change.
 .It Fl x
 Only display status for pools that are exhibiting errors or are otherwise
 unavailable.
-Warnings about pools not using the latest on-disk format will not be included.
+Warnings about pools not using the latest on-disk format, having non-native
+block size or disabled features will not be included.
 .It Fl v
 Displays verbose data error information, printing out a complete list of all
 data errors since the last complete pool scrub.

Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug  8 19:06:24 2014	(r269734)
+++ stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Aug  8 19:11:23 2014	(r269735)
@@ -4101,6 +4101,7 @@ status_callback(zpool_handle_t *zhp, voi
 	if (cbp->cb_explain &&
 	    (reason == ZPOOL_STATUS_OK ||
 	    reason == ZPOOL_STATUS_VERSION_OLDER ||
+	    reason == ZPOOL_STATUS_NON_NATIVE_ASHIFT ||
 	    reason == ZPOOL_STATUS_FEAT_DISABLED)) {
 		if (!cbp->cb_allpools) {
 			(void) printf(gettext("pool '%s' is healthy\n"),