From 27bdc9a206a2012fbb5f2dfc4ba6e485f4bd1ec9 Mon Sep 17 00:00:00 2001 From: mm Date: Thu, 14 Mar 2013 08:25:10 +0000 Subject: Update vendor/illumos/dist to illumos-gate 13983:fe80600e1f8e Illumos ZFS issues: 3604 zdb should print bpobjs more verbosely (fix zdb hang) 3606 zpool status -x shouldn't warn about old on-disk format --- cmd/zdb/zdb.c | 1 + cmd/zpool/zpool_main.c | 5 ++++- man/man1m/zpool.1m | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index a851977..b4b6150 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -1258,6 +1258,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int indent) continue; } dump_bpobj(&subbpo, "subobj", indent + 1); + bpobj_close(&subbpo); } } else { (void) printf(" %*s: object %llu, %llu blkptrs, %s\n", diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index 04137fd..b1326e9 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -3923,7 +3923,10 @@ status_callback(zpool_handle_t *zhp, void *data) * If we were given 'zpool status -x', only report those pools with * problems. */ - if (reason == ZPOOL_STATUS_OK && cbp->cb_explain) { + if (cbp->cb_explain && + (reason == ZPOOL_STATUS_OK || + reason == ZPOOL_STATUS_VERSION_OLDER || + reason == ZPOOL_STATUS_FEAT_DISABLED)) { if (!cbp->cb_allpools) { (void) printf(gettext("pool '%s' is healthy\n"), zpool_get_name(zhp)); diff --git a/man/man1m/zpool.1m b/man/man1m/zpool.1m index 90c2da4..0da5282 100644 --- a/man/man1m/zpool.1m +++ b/man/man1m/zpool.1m @@ -1685,7 +1685,8 @@ can change. .ad .RS 6n Only display status for pools that are exhibiting errors or are otherwise -unavailable. +unavailable. Warnings about pools not using the latest on-disk format will +not be included. .RE .sp -- cgit v1.1