Skip to content

Commit

Permalink
ext3: return after ext3_error in case of failures
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aneesh Kumar K.V authored and Linus Torvalds committed Feb 6, 2008
1 parent 5330838 commit feda58d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions fs/ext3/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit feda58d

Please sign in to comment.