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

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

ext2: return after ext2_error in case of failures 



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

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

fs/ext2/balloc.c

+6 −2
Original line number Diff line number Diff line
@@ -474,11 +474,13 @@ void ext2_free_blocks (struct inode * inode, unsigned long block, 
	    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)) {

		ext2_error (sb, "ext2_free_blocks",

			    "Freeing blocks in system zones - "

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

			    block, count);

		goto error_return;

	}



	for (i = 0, group_freed = 0; i < count; i++) {

		if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
@@ -1311,11 +1313,13 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	    in_range(ret_block, le32_to_cpu(gdp->bg_inode_table),

		      EXT2_SB(sb)->s_itb_per_group) ||

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

		      EXT2_SB(sb)->s_itb_per_group))

		      EXT2_SB(sb)->s_itb_per_group)) {

		ext2_error(sb, "ext2_new_blocks",

			    "Allocating block in system zone - "

			    "blocks from "E2FSBLK", length %lu",

			    ret_block, num);

		goto out;

	}



	performed_allocation = 1;