]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: ext4: fix ext4_validate_inode_bitmap: comm...
authordann frazier <dann.frazier@canonical.com>
Mon, 16 Jul 2018 23:00:00 +0000 (01:00 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 17 Jul 2018 09:02:09 +0000 (11:02 +0200)
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@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
fs/ext4/ialloc.c

index 6e0804d7863394df4447df46b2d3e5a214678b74..8bd0759a88e65670d4e46d05f19deac453144a87 100644 (file)
@@ -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;
 }