diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 08:16:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 08:16:18 -0400 |
| commit | f8cb22cbb8383c9f41e6ccbcd4fb94edb1048bda (patch) | |
| tree | 9b3a333224ec895c053a694dcaff526502b84e6c /fs/ext4/inode.c | |
| parent | 044d408409cc4e1bc75c886e27ca85c270db104c (diff) | |
| parent | ebdcc81c71937b30e09110c02a1e8a21fa770b6f (diff) | |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 51cdd13e1c31..c7fed5b18745 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -2544,7 +2544,7 @@ retry: | |||
| 2544 | 2544 | ||
| 2545 | ext4_journal_stop(handle); | 2545 | ext4_journal_stop(handle); |
| 2546 | 2546 | ||
| 2547 | if (mpd.retval == -ENOSPC) { | 2547 | if ((mpd.retval == -ENOSPC) && sbi->s_journal) { |
| 2548 | /* commit the transaction which would | 2548 | /* commit the transaction which would |
| 2549 | * free blocks released in the transaction | 2549 | * free blocks released in the transaction |
| 2550 | * and try again | 2550 | * and try again |