Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb47dce7 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Return after ext4_error in case of failures 



This fix some instances where we were continuing after calling
ext4_error. ext4_error call panic only if errors=panic mount option is
set. So we need to make sure we return correctly after ext4_error call

Reported by: Adrian Bunk <bunk@kernel.org>

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 91b51a01

fs/ext4/balloc.c

+6 −2
Original line number Diff line number Diff line
@@ -587,11 +587,13 @@ void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb, 
	    in_range(ext4_inode_bitmap(sb, desc), block, count) ||

	    in_range(block, ext4_inode_table(sb, desc), sbi->s_itb_per_group) ||

	    in_range(block + count - 1, ext4_inode_table(sb, desc),

		     sbi->s_itb_per_group))

		     sbi->s_itb_per_group)) {

		ext4_error (sb, "ext4_free_blocks",

			    "Freeing blocks in system zones - "

			    "Block = %llu, count = %lu",

			    block, count);

		goto error_return;

	}



	/*

	 * We are about to start releasing blocks in the bitmap,
@@ -1690,11 +1692,13 @@ ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, 
	    in_range(ret_block, ext4_inode_table(sb, gdp),

		     EXT4_SB(sb)->s_itb_per_group) ||

	    in_range(ret_block + num - 1, ext4_inode_table(sb, gdp),

		     EXT4_SB(sb)->s_itb_per_group))

		     EXT4_SB(sb)->s_itb_per_group)) {

		ext4_error(sb, "ext4_new_block",

			    "Allocating block in system zone - "

			    "blocks from %llu, length %lu",

			     ret_block, num);

		goto out;

	}



	performed_allocation = 1;