|
@@ -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))) {
|
|
(bitmap_blk >= ext4_blocks_count(sbi->s_es))) {
|
|
ext4_error(sb, "Invalid inode bitmap blk %llu in "
|
|
ext4_error(sb, "Invalid inode bitmap blk %llu in "
|
|
"block_group %u", bitmap_blk, block_group);
|
|
"block_group %u", bitmap_blk, block_group);
|
|
|
|
+ ext4_mark_group_bitmap_corrupted(sb, block_group,
|
|
|
|
+ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
|
|
return ERR_PTR(-EFSCORRUPTED);
|
|
return ERR_PTR(-EFSCORRUPTED);
|
|
}
|
|
}
|
|
bh = sb_getblk(sb, bitmap_blk);
|
|
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 - "
|
|
ext4_error(sb, "Cannot read inode bitmap - "
|
|
"block_group = %u, inode_bitmap = %llu",
|
|
"block_group = %u, inode_bitmap = %llu",
|
|
block_group, bitmap_blk);
|
|
block_group, bitmap_blk);
|
|
|
|
+ ext4_mark_group_bitmap_corrupted(sb, block_group,
|
|
|
|
+ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
|
|
return ERR_PTR(-EIO);
|
|
return ERR_PTR(-EIO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -902,6 +906,8 @@ repeat_in_this_group:
|
|
if (group == 0 && (ino + 1) < EXT4_FIRST_INO(sb)) {
|
|
if (group == 0 && (ino + 1) < EXT4_FIRST_INO(sb)) {
|
|
ext4_error(sb, "reserved inode found cleared - "
|
|
ext4_error(sb, "reserved inode found cleared - "
|
|
"inode=%lu", ino + 1);
|
|
"inode=%lu", ino + 1);
|
|
|
|
+ ext4_mark_group_bitmap_corrupted(sb, group,
|
|
|
|
+ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
|
|
goto next_group;
|
|
goto next_group;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1093,6 +1099,8 @@ got:
|
|
err = -EIO;
|
|
err = -EIO;
|
|
ext4_error(sb, "failed to insert inode %lu: doubly allocated?",
|
|
ext4_error(sb, "failed to insert inode %lu: doubly allocated?",
|
|
inode->i_ino);
|
|
inode->i_ino);
|
|
|
|
+ ext4_mark_group_bitmap_corrupted(sb, group,
|
|
|
|
+ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
inode->i_generation = prandom_u32();
|
|
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);
|
|
block_group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);
|
|
bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
|
|
bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
|
|
bitmap_bh = ext4_read_inode_bitmap(sb, block_group);
|
|
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;
|
|
return (struct inode *) bitmap_bh;
|
|
- }
|
|
|
|
|
|
|
|
/* Having the inode bit set should be a 100% indicator that this
|
|
/* Having the inode bit set should be a 100% indicator that this
|
|
* is a valid orphan (no e2fsck run on fs). Orphans also include
|
|
* is a valid orphan (no e2fsck run on fs). Orphans also include
|