From e3c85c0938c5d878927fcb812792b68fd056b188 Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Wed, 5 Dec 2018 12:30:28 -0500 Subject: [PATCH] Move assert in dump_dir() in zdb This one line patch moves an assert in the function dump_dir() below an error check that ensures it ran correctly. This ensures zdb dumps the error that actually caused the problem, as opposed to one of its symptoms. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Tom Caputi Closes #8171 --- cmd/zdb/zdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 52a671557..1a9303d12 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -2522,15 +2522,15 @@ dump_dir(objset_t *os) (void) printf("\tPercent empty: %10lf\n", (double)(max_slot_used - total_slots_used)*100 / (double)max_slot_used); - - ASSERT3U(object_count, ==, usedobjs); - (void) printf("\n"); if (error != ESRCH) { (void) fprintf(stderr, "dmu_object_next() = %d\n", error); abort(); } + + ASSERT3U(object_count, ==, usedobjs); + if (leaked_objects != 0) { (void) printf("%d potentially leaked objects detected\n", leaked_objects);