svn commit: r248266 - in vendor/illumos/dist: cmd/zdb cmd/zpool man/man1m

[Martin Matuska]

Author: mm
Date: Thu Mar 14 08:25:10 2013
New Revision: 248266
URL: http://svnweb.freebsd.org/changeset/base/248266

Log:
  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

Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c
  vendor/illumos/dist/cmd/zpool/zpool_main.c
  vendor/illumos/dist/man/man1m/zpool.1m

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Thu Mar 14 08:18:40 2013	(r248265)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Thu Mar 14 08:25:10 2013	(r248266)
@@ -1258,6 +1258,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int
 				continue;
 			}
 			dump_bpobj(&subbpo, "subobj", indent + 1);
+			bpobj_close(&subbpo);
 		}
 	} else {
 		(void) printf("    %*s: object %llu, %llu blkptrs, %s\n",

Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_main.c	Thu Mar 14 08:18:40 2013	(r248265)
+++ vendor/illumos/dist/cmd/zpool/zpool_main.c	Thu Mar 14 08:25:10 2013	(r248266)
@@ -3923,7 +3923,10 @@ status_callback(zpool_handle_t *zhp, voi
 	 * 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));

Modified: vendor/illumos/dist/man/man1m/zpool.1m
==============================================================================
--- vendor/illumos/dist/man/man1m/zpool.1m	Thu Mar 14 08:18:40 2013	(r248265)
+++ vendor/illumos/dist/man/man1m/zpool.1m	Thu Mar 14 08:25:10 2013	(r248266)
@@ -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