ext4: mark inode bitmap corrupted when found

There are still some cases that we missed to set
block bitmaps corrupted bit properly:

1)inode bitmap number is wrong.
2)failed to read block bitmap due to disk errors.
3)double allocations from bitmap

Also remove a duplicated call ext4_error() afer
ext4_read_inode_bitmap(), as ext4_error() have been
called inside ext4_read_inode_bitmap() properly.

Signed-off-by: Wang Shilong <wshilong@ddn.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 95611cf9f55289f68cfbeed859563e152d030cfa..4d6e007f3569a5440398e2c0f5e88fc1fea7225e 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -129,6 +129,8 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
            (bitmap_blk >= ext4_blocks_count(sbi->s_es))) {
                ext4_error(sb, "Invalid inode bitmap blk %llu in "
                           "block_group %u", bitmap_blk, block_group);
+               ext4_mark_group_bitmap_corrupted(sb, block_group,
+                                       EXT4_GROUP_INFO_IBITMAP_CORRUPT);
                return ERR_PTR(-EFSCORRUPTED);
        }
        bh = sb_getblk(sb, bitmap_blk);
@@ -183,6 +185,8 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
                ext4_error(sb, "Cannot read inode bitmap - "
                           "block_group = %u, inode_bitmap = %llu",
                           block_group, bitmap_blk);
+               ext4_mark_group_bitmap_corrupted(sb, block_group,
+                               EXT4_GROUP_INFO_IBITMAP_CORRUPT);
                return ERR_PTR(-EIO);
        }
 
@@ -902,6 +906,8 @@ repeat_in_this_group:
                if (group == 0 && (ino + 1) < EXT4_FIRST_INO(sb)) {
                        ext4_error(sb, "reserved inode found cleared - "
                                   "inode=%lu", ino + 1);
+                       ext4_mark_group_bitmap_corrupted(sb, group,
+                                       EXT4_GROUP_INFO_IBITMAP_CORRUPT);
                        goto next_group;
                }
 
@@ -1093,6 +1099,8 @@ got:
                err = -EIO;
                ext4_error(sb, "failed to insert inode %lu: doubly allocated?",
                           inode->i_ino);
+               ext4_mark_group_bitmap_corrupted(sb, group,
+                                       EXT4_GROUP_INFO_IBITMAP_CORRUPT);
                goto out;
        }
        inode->i_generation = prandom_u32();
@@ -1194,11 +1202,8 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino)
        block_group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);
        bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
        bitmap_bh = ext4_read_inode_bitmap(sb, block_group);
-       if (IS_ERR(bitmap_bh)) {
-               ext4_error(sb, "inode bitmap error %ld for orphan %lu",
-                          ino, PTR_ERR(bitmap_bh));
+       if (IS_ERR(bitmap_bh))
                return (struct inode *) bitmap_bh;
-       }
 
        /* Having the inode bit set should be a 100% indicator that this
         * is a valid orphan (no e2fsck run on fs).  Orphans also include