diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
| commit | a1be621dfacbef0fd374d8acd553d71e07bf29ac (patch) | |
| tree | 32b0355454b43b1098b5e01dd699fd7281abf781 /fs/ext4/inode.c | |
| parent | 3612fdf780e28b10323dd12d2b0f306c7ada4d4c (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
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 |