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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
Родитель
91b51a018d
Коммит
cb47dce791
|
@ -587,11 +587,13 @@ do_more:
|
||||||
in_range(ext4_inode_bitmap(sb, desc), block, count) ||
|
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, ext4_inode_table(sb, desc), sbi->s_itb_per_group) ||
|
||||||
in_range(block + count - 1, ext4_inode_table(sb, desc),
|
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",
|
ext4_error (sb, "ext4_free_blocks",
|
||||||
"Freeing blocks in system zones - "
|
"Freeing blocks in system zones - "
|
||||||
"Block = %llu, count = %lu",
|
"Block = %llu, count = %lu",
|
||||||
block, count);
|
block, count);
|
||||||
|
goto error_return;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We are about to start releasing blocks in the bitmap,
|
* We are about to start releasing blocks in the bitmap,
|
||||||
|
@ -1690,11 +1692,13 @@ allocated:
|
||||||
in_range(ret_block, ext4_inode_table(sb, gdp),
|
in_range(ret_block, ext4_inode_table(sb, gdp),
|
||||||
EXT4_SB(sb)->s_itb_per_group) ||
|
EXT4_SB(sb)->s_itb_per_group) ||
|
||||||
in_range(ret_block + num - 1, ext4_inode_table(sb, gdp),
|
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",
|
ext4_error(sb, "ext4_new_block",
|
||||||
"Allocating block in system zone - "
|
"Allocating block in system zone - "
|
||||||
"blocks from %llu, length %lu",
|
"blocks from %llu, length %lu",
|
||||||
ret_block, num);
|
ret_block, num);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
performed_allocation = 1;
|
performed_allocation = 1;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче