svn commit: r248956 - in stable/8/cddl/contrib/opensolaris/cmd: zdb zpool

[Martin Matuska]

Author: mm
Date: Sun Mar 31 18:39:11 2013
New Revision: 248956
URL: http://svnweb.freebsd.org/changeset/base/248956

Log:
  MFC r248267:
    Import minor ZFS changes from vendor
  
    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:
  stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  stable/8/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sun Mar 31 18:35:02 2013	(r248955)
+++ stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sun Mar 31 18:39:11 2013	(r248956)
@@ -1225,6 +1225,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: stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sun Mar 31 18:35:02 2013	(r248955)
+++ stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sun Mar 31 18:39:11 2013	(r248956)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 15, 2012
+.Dd March 14, 2013
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -1608,14 +1608,15 @@ is specified, the command exits after
 .Ar count
 reports are printed.
 .Pp
-If a scrub or resilver is in progress, this command reports the percentage done
-and the estimated time to completion. Both of these are only approximate,
+If a scrub or resilver is in progress, this command reports the percentage
+done and the estimated time to completion. Both of these are only approximate,
 because the amount of data in the pool and the other workloads on the system
 can change.
 .Bl -tag -width indent
 .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.
 .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/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Mar 31 18:35:02 2013	(r248955)
+++ stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Mar 31 18:39:11 2013	(r248956)
@@ -4030,7 +4030,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));