Illumos 3604 - zdb should print bpobjs more verbosely (fix zdb hang)

ahrens · behlendorf · commit 074348589b3d · 2016-01-05T11:37:43.000-08:00
3604 zdb should print bpobjs more verbosely (fix zdb hang) References: illumos/illumos-gate@7706186 https://www.illumos.org/issues/3604 https://lists.freebsd.org/pipermail/svn-src-vendor/2015-August/002411.html https://lists.freebsd.org/pipermail/svn-src-head/2015-August/075195.html Porting notes: In ZoL "5810 zdb should print details of bpobj" was merged prior to this change so it must be applied to the new location. Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -1510,6 +1510,7 @@ dump_full_bpobj(bpobj_t *bpo, char *name, int indent)
 				continue;
 			}
 			dump_full_bpobj(&subbpo, "subobj", indent + 1);
+			bpobj_close(&subbpo);
 		}
 	} else {
 		(void) printf("    %*s: object %llu, %llu blkptrs, %s\n",

Original file line number	Diff line number	Diff line change
`@@ -1510,6 +1510,7 @@ dump_full_bpobj(bpobj_t bpo, char name, int indent)`
`1510`	`1510`	`continue;`
`1511`	`1511`	`}`
`1512`	`1512`	`dump_full_bpobj(&subbpo, "subobj", indent + 1);`
	`1513`	`+ bpobj_close(&subbpo);`
`1513`	`1514`	`}`
`1514`	`1515`	`} else {`
`1515`	`1516`	`(void) printf(" %*s: object %llu, %llu blkptrs, %s\n",`