summaryrefslogtreecommitdiff
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-06 11:47:52 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-06 11:47:52 +0100
commit7fc07d84108d54c5b94625c0e168f31b2d66976e (patch)
treebebcbcae186108a815de0c1b90e25b1a5fa3852c /fs/ext4/inode.c
parentb67802ea8061393f7bd2d4db934646e76096027c (diff)
parent8a0be9ef8225638d26b455788f988c8f84ce9e75 (diff)
Merge branch 'sched/core' into sched/cleanups
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c2
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:
ext4_journal_stop(handle);
- if (mpd.retval == -ENOSPC) {
+ if ((mpd.retval == -ENOSPC) && sbi->s_journal) {
/* commit the transaction which would
* free blocks released in the transaction
* and try again