From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Tue, 1 Dec 2015 13:25:07 +0000 (+0900)
Subject: sys/vfs/hammer: Cast HAMMER_BLOCKMAP_RADIX1|2 macros to int
X-Git-Tag: v4.6.0rc~1269
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/37fa1bc7f8b3c84a0f74952291352051af180b50

sys/vfs/hammer: Cast HAMMER_BLOCKMAP_RADIX1|2 macros to int

RADIX macros represent how many layer1/2 entries (32/16 bytes)
a 8MB big-block can hold, but these aren't zone-x offset.

These are typicaly used as an index of array where each entry
is a data structure that corresponds to layer1/2 entry,
therefore it makes sense to cast these macros to int.
---

diff --git a/sbin/hammer/cmd_blockmap.c b/sbin/hammer/cmd_blockmap.c
index 286f5ff2e1..cc7ae01d18 100644
--- a/sbin/hammer/cmd_blockmap.c
+++ b/sbin/hammer/cmd_blockmap.c
@@ -279,7 +279,7 @@ check_freemap(hammer_blockmap_t freemap)
 
 	collect_freemap_layer1(freemap);
 
-	for (i = 0; i < (int)HAMMER_BLOCKMAP_RADIX1; ++i) {
+	for (i = 0; i < HAMMER_BLOCKMAP_RADIX1; ++i) {
 		offset = freemap->phys_offset + i * sizeof(*layer1);
 		layer1 = get_buffer_data(offset, &buffer1, 0);
 		if (layer1->phys_offset != HAMMER_BLOCKMAP_UNAVAIL)
@@ -586,8 +586,7 @@ dump_collect(collect_t collect, struct zone_stat *stats)
 	struct hammer_blockmap_layer2 *track2;
 	struct hammer_blockmap_layer2 *layer2;
 	hammer_off_t offset;
-	size_t i;
-	int zone;
+	int i, zone;
 
 	for (i = 0; i < HAMMER_BLOCKMAP_RADIX2; ++i) {
 		track2 = &collect->track2[i];
diff --git a/sys/vfs/hammer/hammer_disk.h b/sys/vfs/hammer/hammer_disk.h
index 31a7accdab..e685e9b60e 100644
--- a/sys/vfs/hammer/hammer_disk.h
+++ b/sys/vfs/hammer/hammer_disk.h
@@ -342,9 +342,9 @@ typedef struct hammer_blockmap_layer2 *hammer_blockmap_layer2_t;
 #define HAMMER_BLOCKMAP_UNAVAIL	((hammer_off_t)-1LL)
 
 #define HAMMER_BLOCKMAP_RADIX1	/* 2^18 = 262144 */	\
-	(HAMMER_BIGBLOCK_SIZE / sizeof(struct hammer_blockmap_layer1))
+	((int)(HAMMER_BIGBLOCK_SIZE / sizeof(struct hammer_blockmap_layer1)))
 #define HAMMER_BLOCKMAP_RADIX2	/* 2^19 = 524288 */	\
-	(HAMMER_BIGBLOCK_SIZE / sizeof(struct hammer_blockmap_layer2))
+	((int)(HAMMER_BIGBLOCK_SIZE / sizeof(struct hammer_blockmap_layer2)))
 
 #define HAMMER_BLOCKMAP_LAYER1	/* 2^(18+19+23) = 1EB */	\
 	(HAMMER_BLOCKMAP_RADIX1 * HAMMER_BLOCKMAP_LAYER2)