[PATCH -V3 3/3] tune2fs: handle bad blocks when resizing inodes

["Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>]

When increasing inode size if we find that the new block
that we needed to increase the inode table size is a bad
block we fail. This make sure we don't end up with a corrupt
file system when doing inode resize on a file system having
bad blocks.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 misc/tune2fs.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 966738b..546dab9 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -969,9 +969,15 @@ static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
 			ext2fs_block_bitmap bmap)
 {
 	dgrp_t i;
+	int retval;
+	ext2_badblocks_list bb_list = 0;
 	blk_t j, needed_blocks = 0;
 	blk_t start_blk, end_blk;
 
+	retval = ext2fs_read_bb_inode(fs, &bb_list);
+        if (retval)
+                return retval;
+
 	for (i = 0; i < fs->group_desc_count; i++) {
 		start_blk = fs->group_desc[i].bg_inode_table +
 					fs->inode_blocks_per_group;
@@ -981,10 +987,14 @@ static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
 
 		for (j = start_blk; j < end_blk; j++) {
 			if (ext2fs_test_block_bitmap(fs->block_map, j)) {
-				/* FIXME!!
-				 * What happens if the block is marked
-				 * as a bad block
+				/*
+				 * IF the block is a bad block we fail
 				 */
+				if (ext2fs_badblocks_list_test(bb_list, j)) {
+					ext2fs_badblocks_list_free(bb_list);
+					return ENOSPC;
+				}
+
 				ext2fs_mark_block_bitmap(bmap, j);
 			} else {
 				/*
@@ -997,6 +1007,7 @@ static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
 		needed_blocks += end_blk - start_blk;
 	}
 
+	ext2fs_badblocks_list_free(bb_list);
 	if (needed_blocks > fs->super->s_free_blocks_count)
 		return ENOSPC;
 
-- 
1.6.4.13.ge6580