svn commit: r316856 - head/cddl/contrib/opensolaris/cmd/zdb

[Alan Somers]

Author: asomers
Date: Fri Apr 14 16:30:37 2017
New Revision: 316856
URL: https://svnweb.freebsd.org/changeset/base/316856

Log:
  MFV 316855
  
  7900 zdb shouldn't print the path of a znode at verbosity < 5
  
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Reviewed by: Matt Ahrens <mahrens at delphix.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Alan Somers <asomers at freebsd.org>
  
  illumos/illumos-gate at e548d2fa41d1baa06662ed9abbb8bcec86e27dd9
  https://www.illumos.org/issues/7900
  
  MFC after:	3 weeks
  Sponsored by:	Spectra Logic Corp

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.c

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Apr 14 16:18:53 2017	(r316855)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Apr 14 16:30:37 2017	(r316856)
@@ -1718,23 +1718,19 @@ dump_znode(objset_t *os, uint64_t object
 		return;
 	}
 
-	error = zfs_obj_to_path(os, object, path, sizeof (path));
-	if (error != 0) {
-		(void) snprintf(path, sizeof (path), "\?\?\?<object#%llu>",
-		    (u_longlong_t)object);
-	}
-	if (dump_opt['d'] < 3) {
-		(void) printf("\t%s\n", path);
-		(void) sa_handle_destroy(hdl);
-		return;
-	}
-
 	z_crtime = (time_t)crtm[0];
 	z_atime = (time_t)acctm[0];
 	z_mtime = (time_t)modtm[0];
 	z_ctime = (time_t)chgtm[0];
 
-	(void) printf("\tpath	%s\n", path);
+	if (dump_opt['d'] > 4) {
+		error = zfs_obj_to_path(os, object, path, sizeof (path));
+		if (error != 0) {
+			(void) snprintf(path, sizeof (path),
+			    "\?\?\?<object#%llu>", (u_longlong_t)object);
+		}
+		(void) printf("\tpath	%s\n", path);
+	}
 	dump_uidgid(os, uid, gid);
 	(void) printf("\tatime	%s", ctime(&z_atime));
 	(void) printf("\tmtime	%s", ctime(&z_mtime));