[PATCH 1/2][Cosmic][SRU Bionic] UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: ext4: fix ext4_validate_inode_bitmap: comm stress-ng: Corrupt inode bitmap"

dann frazier dann.frazier at canonical.com
Mon Jul 16 23:00:49 UTC 2018


BugLink: https://bugs.launchpad.net/bugs/1781709

This reverts commit 00f03e5b5ce3cbc4e202402099275793ddee5c23.

This fix was incomplete. Will replace with the complete fix in the next commit.

Signed-off-by: dann frazier <dann.frazier at canonical.com>
---
 fs/ext4/ialloc.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index b5e2cc28af470..555931386375b 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -91,8 +91,6 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
 		return -EFSCORRUPTED;
 
 	ext4_lock_group(sb, block_group);
-	if (buffer_verified(bh))
-		goto verified;
 	blk = ext4_inode_bitmap(sb, desc);
 	if (!ext4_inode_bitmap_csum_verify(sb, block_group, desc, bh,
 					   EXT4_INODES_PER_GROUP(sb) / 8)) {
@@ -110,7 +108,6 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
 		return -EFSBADCRC;
 	}
 	set_buffer_verified(bh);
-verified:
 	ext4_unlock_group(sb, block_group);
 	return 0;
 }
-- 
2.18.0





More information about the kernel-team mailing list