summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authorasomers <asomers@FreeBSD.org>2017-05-30 22:43:08 +0000
committerasomers <asomers@FreeBSD.org>2017-05-30 22:43:08 +0000
commit99f9fa7988bbe51a2433629d4ae5f037fa4a5dd6 (patch)
tree87869dd18d07cedb2253d0b07c7e9c2189aa2a40 /cddl
parent1c3c95c63fac7440956126fd607ab575118c66e6 (diff)
downloadFreeBSD-src-99f9fa7988bbe51a2433629d4ae5f037fa4a5dd6.zip
FreeBSD-src-99f9fa7988bbe51a2433629d4ae5f037fa4a5dd6.tar.gz
MFC r316856:
MFV 316855 7900 zdb shouldn't print the path of a znode at verbosity < 5 Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Matt Ahrens <mahrens@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> Author: Alan Somers <asomers@freebsd.org> illumos/illumos-gate@e548d2fa41d1baa06662ed9abbb8bcec86e27dd9 https://www.illumos.org/issues/7900 Sponsored by: Spectra Logic Corp
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zdb/zdb.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
index d3c4269..c0b7cdc 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
@@ -1719,23 +1719,19 @@ dump_znode(objset_t *os, uint64_t object, void *data, size_t size)
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));
OpenPOWER on IntegriCloud