Merge tag 'mac80211-for-davem-2016-06-01' of git://git.kernel.org/pub/scm/linux/kerne...

[karo-tx-linux.git] / fs / ext4 / balloc.c

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index fe1f50fe764ff9238354e2e30491c6e1e6d149b9..3020fd70c392d1f2b55913e374ed11831b2aa967 100644 (file)
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -610,7 +610,8 @@ int ext4_should_retry_alloc(struct super_block *sb, int *retries)
 
        jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
 
-       return jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);
+       jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);
+       return 1;
 }
 
 /*