summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2009-02-26 06:57:35 +0100
committerTheodore Ts'o <tytso@mit.edu>2009-02-26 06:57:35 +0100
commit8f64b32eb73fbfe9f38c4123121b63ee409278a7 (patch)
tree1c856ed32d7a282dbde0cea2e8839e2c2de51ba9 /fs/ext4/inode.c
parentext4: Reorder fs/Makefile so that ext2 root fs's are mounted using ext2 (diff)
downloadlinux-8f64b32eb73fbfe9f38c4123121b63ee409278a7.tar.xz
linux-8f64b32eb73fbfe9f38c4123121b63ee409278a7.zip
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>
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