svn commit: r348552 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/zdb

[Alexander Motin]

Author: mav
Date: Mon Jun  3 17:06:02 2019
New Revision: 348552
URL: https://svnweb.freebsd.org/changeset/base/348552

Log:
  9682 page fault in dsl_async_clone_destroy() while opening pool
  
  illumos/illumos-gate at ade2c82828f0dca1f46919aa1bd936ea1a5a0047
  
  Reviewed by: Brad Lewis <brad.lewis at delphix.com>
  Reviewed by: Matt Ahrens <matt at delphix.com>
  Reviewed by: Sara Hartse <sara.hartse at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author:     Serapheim Dimitropoulos <serapheim at delphix.com>

Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Mon Jun  3 17:02:35 2019	(r348551)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Mon Jun  3 17:06:02 2019	(r348552)
@@ -2245,10 +2245,11 @@ dump_dir(objset_t *os)
 	dmu_objset_name(os, osname);
 
 	(void) printf("Dataset %s [%s], ID %llu, cr_txg %llu, "
-	    "%s, %llu objects%s\n",
+	    "%s, %llu objects%s%s\n",
 	    osname, type, (u_longlong_t)dmu_objset_id(os),
 	    (u_longlong_t)dds.dds_creation_txg,
-	    numbuf, (u_longlong_t)usedobjs, blkbuf);
+	    numbuf, (u_longlong_t)usedobjs, blkbuf,
+	    (dds.dds_inconsistent) ? " (inconsistent)" : "");
 
 	if (zopt_objects != 0) {
 		for (i = 0; i < zopt_objects; i++)