diff options
| author | delphij <delphij@FreeBSD.org> | 2014-08-08 19:11:23 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-08-08 19:11:23 +0000 |
| commit | 3247b8806e41c777c15d84f784c2223c66a42eb3 (patch) | |
| tree | eaffc61d425abed5c2489618e9dd5bd3834b0314 /cddl | |
| parent | ccb7d1d4f5e212cdc4a72d9745fa5d157312143f (diff) | |
| download | FreeBSD-src-3247b8806e41c777c15d84f784c2223c66a42eb3.zip FreeBSD-src-3247b8806e41c777c15d84f784c2223c66a42eb3.tar.gz | |
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
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool.8 | 5 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 index 9eb7874..306f458 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8 @@ -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. diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index f4855b5..3228994 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"), |
