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

Commit feda58d3 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

ext3: return after ext3_error in case of failures 



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

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53308383

fs/ext3/balloc.c

+6 −2
Original line number Diff line number Diff line
@@ -530,11 +530,13 @@ void ext3_free_blocks_sb(handle_t *handle, struct super_block *sb, 
	    in_range (block, le32_to_cpu(desc->bg_inode_table),

		      sbi->s_itb_per_group) ||

	    in_range (block + count - 1, le32_to_cpu(desc->bg_inode_table),

		      sbi->s_itb_per_group))

		      sbi->s_itb_per_group)) {

		ext3_error (sb, "ext3_free_blocks",

			    "Freeing blocks in system zones - "

			    "Block = "E3FSBLK", count = %lu",

			    block, count);

		goto error_return;

	}



	/*

	 * We are about to start releasing blocks in the bitmap,
@@ -1637,11 +1639,13 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode, 
	    in_range(ret_block, le32_to_cpu(gdp->bg_inode_table),

		      EXT3_SB(sb)->s_itb_per_group) ||

	    in_range(ret_block + num - 1, le32_to_cpu(gdp->bg_inode_table),

		      EXT3_SB(sb)->s_itb_per_group))

		      EXT3_SB(sb)->s_itb_per_group)) {

		ext3_error(sb, "ext3_new_block",

			    "Allocating block in system zone - "

			    "blocks from "E3FSBLK", length %lu",

			     ret_block, num);

		goto out;

	}



	performed_allocation = 1;