backuout 9421: causes TRITON-372backout_9421

backuout 9422: causes TRITON-372

1 files changed, 3 insertions, 12 deletions

diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c
index 7ccd124dbe..2470545a52 100644
--- a/usr/src/cmd/zdb/zdb.c
+++ b/usr/src/cmd/zdb/zdb.c
@@ -108,7 +108,6 @@ uint64_t *zopt_object = NULL;
 static unsigned zopt_objects = 0;
 libzfs_handle_t *g_zfs;
 uint64_t max_inflight = 1000;
-static int leaked_objects = 0;
 
 static void snprintf_blkptr_compact(char *, size_t, const blkptr_t *);
 
@@ -1966,12 +1965,9 @@ dump_znode(objset_t *os, uint64_t object, void *data, size_t size)
 
 	if (dump_opt['d'] > 4) {
 		error = zfs_obj_to_path(os, object, path, sizeof (path));
-		if (error == ESTALE) {
-			(void) snprintf(path, sizeof (path), "on delete queue");
-		} else if (error != 0) {
-			leaked_objects++;
+		if (error != 0) {
 			(void) snprintf(path, sizeof (path),
-			    "path not found, possibly leaked");
+			    "\?\?\?<object#%llu>", (u_longlong_t)object);
 		}
 		(void) printf("\tpath	%s\n", path);
 	}
@@ -2301,11 +2297,6 @@ dump_dir(objset_t *os)
 		(void) fprintf(stderr, "dmu_object_next() = %d\n", error);
 		abort();
 	}
-	if (leaked_objects != 0) {
-		(void) printf("%d potentially leaked objects detected\n",
-		    leaked_objects);
-		leaked_objects = 0;
-	}
 }
 
 static void
@@ -5382,5 +5373,5 @@ main(int argc, char **argv)
 	libzfs_fini(g_zfs);
 	kernel_fini();
 
-	return (error);
+	return (0);
 }