ext4: don't call jbd2_journal_force_commit_nested without journal
Running without a journal, I oopsed when I ran out of space, because we called jbd2_journal_force_commit_nested() from ext4_should_retry_alloc() without a journal. This should take care of it, I think. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
d8ae4601a4
commit
8f64b32eb7
|
@ -609,7 +609,9 @@ int ext4_claim_free_blocks(struct ext4_sb_info *sbi,
|
||||||
*/
|
*/
|
||||||
int ext4_should_retry_alloc(struct super_block *sb, int *retries)
|
int ext4_should_retry_alloc(struct super_block *sb, int *retries)
|
||||||
{
|
{
|
||||||
if (!ext4_has_free_blocks(EXT4_SB(sb), 1) || (*retries)++ > 3)
|
if (!ext4_has_free_blocks(EXT4_SB(sb), 1) ||
|
||||||
|
(*retries)++ > 3 ||
|
||||||
|
!EXT4_SB(sb)->s_journal)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
|
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
|
||||||
|
|
|
@ -2544,7 +2544,7 @@ retry:
|
||||||
|
|
||||||
ext4_journal_stop(handle);
|
ext4_journal_stop(handle);
|
||||||
|
|
||||||
if (mpd.retval == -ENOSPC) {
|
if ((mpd.retval == -ENOSPC) && sbi->s_journal) {
|
||||||
/* commit the transaction which would
|
/* commit the transaction which would
|
||||||
* free blocks released in the transaction
|
* free blocks released in the transaction
|
||||||
* and try again
|
* and try again
|
||||||
|
|
Loading…
Reference in New Issue