From 6c9ce8a9b060ff81b537560a9880c569e60ca512 Mon Sep 17 00:00:00 2001 From: Phillip Susi Date: Mon, 27 Feb 2012 00:56:49 -0500 Subject: [PATCH] e2image: skip uninitialized bitmaps and inode tables When the block bitmap is uninitialized, skip copying it. When the inode bitmap is uninitialized, skip copying it, as well as the inode table. When there are unused inodes towards the end of the table, skip those blocks too. Signed-off-by: Phillip Susi Signed-off-by: Theodore Ts'o --- misc/e2image.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/misc/e2image.c b/misc/e2image.c index 93359cf..4a28900 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -341,18 +341,27 @@ static void mark_table_blocks(ext2_filsys fs) /* * Mark the blocks used for the inode table */ - if (ext2fs_inode_table_loc(fs, i)) { + if (!ext2fs_bg_flags_test(fs, i, EXT2_BG_INODE_UNINIT) && + ext2fs_inode_table_loc(fs, i)) { + unsigned int end = (unsigned) fs->inode_blocks_per_group; + /* skip unused blocks */ + if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) + end -= (ext2fs_bg_itable_unused(fs, i) / + EXT2_INODES_PER_BLOCK(fs->super)); for (j = 0, b = ext2fs_inode_table_loc(fs, i); - j < (unsigned) fs->inode_blocks_per_group; - j++, b++) + j < end; + j++, b++) { ext2fs_mark_block_bitmap2(meta_block_map, b); - meta_blocks_count += fs->inode_blocks_per_group; + meta_blocks_count++; + } } /* * Mark block used for the block bitmap */ - if (ext2fs_block_bitmap_loc(fs, i)) { + if (!ext2fs_bg_flags_test(fs, i, EXT2_BG_BLOCK_UNINIT) && + ext2fs_block_bitmap_loc(fs, i)) { ext2fs_mark_block_bitmap2(meta_block_map, ext2fs_block_bitmap_loc(fs, i)); meta_blocks_count++; @@ -361,7 +370,8 @@ static void mark_table_blocks(ext2_filsys fs) /* * Mark block used for the inode bitmap */ - if (ext2fs_inode_bitmap_loc(fs, i)) { + if (!ext2fs_bg_flags_test(fs, i, EXT2_BG_INODE_UNINIT) && + ext2fs_inode_bitmap_loc(fs, i)) { ext2fs_mark_block_bitmap2(meta_block_map, ext2fs_inode_bitmap_loc(fs, i)); meta_blocks_count++; -- 1.8.3.1