diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 11:47:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 11:47:52 +0100 |
| commit | 7fc07d84108d54c5b94625c0e168f31b2d66976e (patch) | |
| tree | bebcbcae186108a815de0c1b90e25b1a5fa3852c /fs/ext4/balloc.c | |
| parent | b67802ea8061393f7bd2d4db934646e76096027c (diff) | |
| parent | 8a0be9ef8225638d26b455788f988c8f84ce9e75 (diff) | |
| download | lwn-7fc07d84108d54c5b94625c0e168f31b2d66976e.tar.gz lwn-7fc07d84108d54c5b94625c0e168f31b2d66976e.zip | |
Merge branch 'sched/core' into sched/cleanups
Diffstat (limited to 'fs/ext4/balloc.c')
| -rw-r--r-- | fs/ext4/balloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 9a50b8052dcf..de9459b4cb94 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -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) { - 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; jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id); |