ext4: disable dioread_nolock whenever delayed allocation is disabled

[linux-2.6-block.git] / fs / ext4 / ext4_jbd2.h

diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h
index 7ea4f6fa173b4794266f7921851d57aa7940e974..4b9002f0e84c0efff1498bfafa1310d3fdf37282 100644 (file)
--- a/fs/ext4/ext4_jbd2.h
+++ b/fs/ext4/ext4_jbd2.h
@@ -512,6 +512,9 @@ static inline int ext4_should_dioread_nolock(struct inode *inode)
                return 0;
        if (ext4_should_journal_data(inode))
                return 0;
+       /* temporary fix to prevent generic/422 test failures */
+       if (!test_opt(inode->i_sb, DELALLOC))
+               return 0;
        return 1;
 }