svn commit: r317856 - stable/11/cddl/contrib/opensolaris/cmd/zdb
Alan Somers
asomers at FreeBSD.org
Fri May 5 21:57:28 UTC 2017
Author: asomers
Date: Fri May 5 21:57:26 2017
New Revision: 317856
URL: https://svnweb.freebsd.org/changeset/base/317856
Log:
MFC r316856:
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
Sponsored by: Spectra Logic Corp
Modified:
stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri May 5 21:52:14 2017 (r317855)
+++ stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri May 5 21:57:26 2017 (r317856)
@@ -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));
More information about the svn-src-stable-11
mailing list