From: Li Dongyang <dongyangli@ddn.com>
Date: Wed, 20 Nov 2019 04:35:24 +0000 (+0000)
Subject: mke2fs: fix setting bad blocks in the block bitmap
X-Git-Tag: v1.45.5~14
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d23f88ebaafbb5141822f5998a4417abdb8ffb36;p=tools%2Fe2fsprogs.git

mke2fs: fix setting bad blocks in the block bitmap

We mark the bad blocks as used on fs->block_map before allocating
group tables.  Don't translate the block number to cluster number when
doing this, the fs->block_map is still a block-granularity allocation
map, it will be coverted later by ext2fs_convert_subcluster_bitmap().

Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index d7cf257..30e353d 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -344,7 +344,7 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n"
 		exit(1);
 	}
 	while (ext2fs_badblocks_list_iterate(bb_iter, &blk))
-		ext2fs_mark_block_bitmap2(fs->block_map, EXT2FS_B2C(fs, blk));
+		ext2fs_mark_block_bitmap2(fs->block_map, blk);
 	ext2fs_badblocks_list_iterate_end(bb_iter);
 }