From 6291ccf877a810d6bc24ab8da018e52075cb02f4 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Thu, 20 Aug 2015 19:22:06 +0900 Subject: [PATCH] sbin/hammer: Cleanup hammer show Also change "=%d" to "=B%d" on error to clearly distinct from non-error case "=%d%%". 'B' usually represents error (bad) in hammer show. --- sbin/hammer/cmd_show.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/sbin/hammer/cmd_show.c b/sbin/hammer/cmd_show.c index 860133c41f..3af8f56685 100644 --- a/sbin/hammer/cmd_show.c +++ b/sbin/hammer/cmd_show.c @@ -489,25 +489,19 @@ print_bigblock_fill(hammer_off_t offset) int error; blockmap_lookup(offset, &layer1, &layer2, &error); + printf("z%d:v%d:%lu:%lu:%lu=", + HAMMER_ZONE_DECODE(offset), + HAMMER_VOL_DECODE(offset), + HAMMER_BLOCKMAP_LAYER1_INDEX(offset), + HAMMER_BLOCKMAP_LAYER2_INDEX(offset), + offset & HAMMER_BIGBLOCK_MASK64); + if (error) { - printf("z%d:v%d:%lu:%lu:%lu=%d", - HAMMER_ZONE_DECODE(offset), - HAMMER_VOL_DECODE(offset), - HAMMER_BLOCKMAP_LAYER1_INDEX(offset), - HAMMER_BLOCKMAP_LAYER2_INDEX(offset), - offset & HAMMER_BIGBLOCK_MASK64, - error); + printf("B%d", error); } else { fill = layer2.bytes_free * 100 / HAMMER_BIGBLOCK_SIZE; fill = 100 - fill; - - printf("z%d:v%d:%lu:%lu:%lu=%d%%", - HAMMER_ZONE_DECODE(offset), - HAMMER_VOL_DECODE(offset), - HAMMER_BLOCKMAP_LAYER1_INDEX(offset), - HAMMER_BLOCKMAP_LAYER2_INDEX(offset), - offset & HAMMER_BIGBLOCK_MASK64, - fill); + printf("%d%%", fill); } } -- 2.41.0