2019-11-20 04:36:06

by Li Dongyang

Subject: [PATCH v3 2/5] 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 <[email protected]>
---
misc/mke2fs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index ffea8233..be38d2c4 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);
}

--
2.24.0

2019-12-31 03:49:19

by Theodore Ts'o

Subject: Re: [PATCH v3 2/5] mke2fs: fix setting bad blocks in the block bitmap

On Wed, Nov 20, 2019 at 04:35:24AM +0000, Li Dongyang wrote:
> 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 <[email protected]>

Applied on the maint branch, thanks. (The other patches need to go on
the e2fsprogs master/next branch, and the last is a kernel patch.)

- Ted