From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sat, 11 Jul 2015 10:18:24 +0000 (+0900)
Subject: sbin/hammer: Cleanup blockmap initialization
X-Git-Tag: v4.3.1~198
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/44af2e17675e22259df73d96a341096645c252cd

sbin/hammer: Cleanup blockmap initialization

- Initialize blockmap fields in the same order as
  struct definition as well as format_undomap().
---

diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c
index 44c9087f97..142891b223 100644
--- a/sbin/hammer/ondisk.c
+++ b/sbin/hammer/ondisk.c
@@ -487,10 +487,11 @@ format_freemap(struct volume_info *root_vol, hammer_blockmap_t blockmap)
 	rel_buffer(buffer);
 
 	blockmap = &root_vol->ondisk->vol0_blockmap[HAMMER_ZONE_FREEMAP_INDEX];
+	bzero(blockmap, sizeof(*blockmap));
 	blockmap->phys_offset = layer1_offset;
-	blockmap->alloc_offset = HAMMER_ENCODE_RAW_BUFFER(255, -1);
+	blockmap->first_offset = 0;
 	blockmap->next_offset = HAMMER_ENCODE_RAW_BUFFER(0, 0);
-	blockmap->reserved01 = 0;
+	blockmap->alloc_offset = HAMMER_ENCODE_RAW_BUFFER(255, -1);
 	blockmap->entry_crc = crc32(blockmap, HAMMER_BLOCKMAP_CRCSIZE);
 	root_vol->cache.modified = 1;
 }
@@ -811,10 +812,11 @@ format_undomap(hammer_volume_ondisk_t ondisk)
 void
 format_blockmap(hammer_blockmap_t blockmap, hammer_off_t zone_base)
 {
+	bzero(blockmap, sizeof(*blockmap));
 	blockmap->phys_offset = 0;
-	blockmap->alloc_offset = HAMMER_ENCODE(zone_base, 255, -1);
 	blockmap->first_offset = zone_base;
 	blockmap->next_offset = zone_base;
+	blockmap->alloc_offset = HAMMER_ENCODE(zone_base, 255, -1);
 	blockmap->entry_crc = crc32(blockmap, HAMMER_BLOCKMAP_CRCSIZE);
 }