Merge branch 'mb/dio' into master

[linux-2.6-microblaze.git] / fs / ext4 / extents.c

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 59f741b..0e8708b 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1765,16 +1765,9 @@ ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,
         */
        if (ext1_ee_len + ext2_ee_len > EXT_INIT_MAX_LEN)
                return 0;
-       /*
-        * The check for IO to unwritten extent is somewhat racy as we
-        * increment i_unwritten / set EXT4_STATE_DIO_UNWRITTEN only after
-        * dropping i_data_sem. But reserved blocks should save us in that
-        * case.
-        */
+
        if (ext4_ext_is_unwritten(ex1) &&
-           (ext4_test_inode_state(inode, EXT4_STATE_DIO_UNWRITTEN) ||
-            atomic_read(&EXT4_I(inode)->i_unwritten) ||
-            (ext1_ee_len + ext2_ee_len > EXT_UNWRITTEN_MAX_LEN)))
+           ext1_ee_len + ext2_ee_len > EXT_UNWRITTEN_MAX_LEN)
                return 0;
 #ifdef AGGRESSIVE_TEST
        if (ext1_ee_len >= 4)