diff options
author | smh <smh@FreeBSD.org> | 2014-07-14 14:33:03 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2014-07-14 14:33:03 +0000 |
commit | 5563475471e7bc782d1966087e7aa4dfa6473d9e (patch) | |
tree | 1fcb1044a4d3b7c28f6c0f058f03e43db0deb06a | |
parent | 3b9fdabf1f3d959f83e5539d2ba59e4cc1680514 (diff) | |
download | FreeBSD-src-5563475471e7bc782d1966087e7aa4dfa6473d9e.zip FreeBSD-src-5563475471e7bc782d1966087e7aa4dfa6473d9e.tar.gz |
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
-rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool.8 | 3 | ||||
-rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 index 26c37c8..ca0ae88 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 @@ -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. diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index 7f27bb0..28fdd80 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -4101,6 +4101,7 @@ status_callback(zpool_handle_t *zhp, void *data) 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"), |