From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sun, 15 Sep 2019 19:19:09 +0000 (+0900)
Subject: sbin/hammer2: Remove dofreemap argument from show_bref()
X-Git-Tag: v5.8.0rc1~868
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/dc7090194dfbe5166919018f8cfb2cce8c62cfaa

sbin/hammer2: Remove dofreemap argument from show_bref()

208afee512 removed `dofreemap` test from show_bref() by having
HAMMER2_BREF_TYPE_FREEMAP switch/case for blockref type,
so `dofreemap` is no longer needed in show_bref().

Blockref itself contains `dofreemap` information.
---

diff --git a/sbin/hammer2/cmd_debug.c b/sbin/hammer2/cmd_debug.c
index aeb101293e..8a29bcee30 100644
--- a/sbin/hammer2/cmd_debug.c
+++ b/sbin/hammer2/cmd_debug.c
@@ -375,8 +375,7 @@ cmd_debugspan(const char *hostname)
  ************************************************************************/
 
 static void show_bref(hammer2_volume_data_t *voldata, int fd, int tab,
-			int bi, hammer2_blockref_t *bref,
-			int dofreemap, int norecurse);
+			int bi, hammer2_blockref_t *bref, int norecurse);
 static void tabprintf(int tab, const char *ctl, ...);
 
 static hammer2_off_t TotalFreeAccum16;
@@ -429,12 +428,11 @@ cmd_show(const char *devpath, int dofreemap)
 				best = broot;
 			}
 			if (VerboseOpt >= 3)
-				show_bref(&media.voldata, fd, 0, i, &broot,
-				    dofreemap, 0);
+				show_bref(&media.voldata, fd, 0, i, &broot, 0);
 		}
 	}
 	if (VerboseOpt < 3)
-		show_bref(&media.voldata, fd, 0, best_i, &best, dofreemap, 0);
+		show_bref(&media.voldata, fd, 0, best_i, &best, 0);
 	close(fd);
 
 	if (dofreemap && VerboseOpt < 3) {
@@ -448,7 +446,7 @@ cmd_show(const char *devpath, int dofreemap)
 
 static void
 show_bref(hammer2_volume_data_t *voldata, int fd, int tab,
-	  int bi, hammer2_blockref_t *bref, int dofreemap, int norecurse)
+	  int bi, hammer2_blockref_t *bref, int norecurse)
 {
 	hammer2_media_data_t media;
 	hammer2_blockref_t *bscan;
@@ -841,8 +839,7 @@ skip_data:
 	 */
 	for (i = 0; norecurse == 0 && i < bcount; ++i) {
 		if (bscan[i].type != HAMMER2_BREF_TYPE_EMPTY) {
-			show_bref(voldata, fd, tab, i, &bscan[i], dofreemap,
-				  failed);
+			show_bref(voldata, fd, tab, i, &bscan[i], failed);
 		}
 	}
 	tab -= show_tab;