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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
533083836f
commit
feda58d37a
|
@ -530,11 +530,13 @@ do_more:
|
|||
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 @@ allocated:
|
|||
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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue