Merge branch 'next' into upstream-merge

[net-next-2.6.git] / fs / ext4 / fsync.c

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 1c701f635961491b2f433a7c7ddf4acf95bbcee2..c1a7bc923cf6084c84f32b91294ec5feecf8b92c 100644 (file)
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -211,10 +211,9 @@ int ext4_sync_file(struct file *file, int datasync)
                    (journal->j_fs_dev != journal->j_dev) &&
                    (journal->j_flags & JBD2_BARRIER))
                        blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
-                                       NULL, BLKDEV_IFL_WAIT);
+                                       NULL);
                ret = jbd2_log_wait_commit(journal, commit_tid);
        } else if (journal->j_flags & JBD2_BARRIER)
-               blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
-                       BLKDEV_IFL_WAIT);
+               blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
        return ret;
 }