libext2fs: teach e2image imager to handle bigalloc file systems

Previously, "mke2fs -t ext4 -O bigalloc /tmp/foo.img 4G ;
e2image /tmp/foo.img /tmp/foo.e2i" would result in e2image
dumping core.  Fix ext2fs_image_bitmap_write() so it handles
file systems with bigalloc correctly.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c
index 357443f23852288e698682cd04b7f075e2e7c901..efb85b947ad82f94892b105c54686adf42ed1e61 100644 (file)
--- a/lib/ext2fs/imager.c
+++ b/lib/ext2fs/imager.c
@@ -309,8 +309,8 @@ errcode_t ext2fs_image_bitmap_write(ext2_filsys fs, int fd, int flags)
                }
                bmap = fs->block_map;
                itr = fs->super->s_first_data_block;
-               cnt = EXT2_GROUPS_TO_BLOCKS(fs->super, fs->group_desc_count);
-               size = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
+               cnt = EXT2_GROUPS_TO_CLUSTERS(fs->super, fs->group_desc_count);
+               size = EXT2_CLUSTERS_PER_GROUP(fs->super) / 8;
        }
        total_size = size * fs->group_desc_count;