Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

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

diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index 6194121..6c4f19b 100644 (file)
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -1071,7 +1071,7 @@ static int ext4_fc_perform_commit(journal_t *journal)
         * flush before we start writing fast commit blocks.
         */
        if (journal->j_fs_dev != journal->j_dev)
-               blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS);
+               blkdev_issue_flush(journal->j_fs_dev);
 
        blk_start_plug(&plug);
        if (sbi->s_fc_bytes == 0) {
@@ -1528,7 +1528,7 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl)
 out:
        iput(inode);
        if (!ret)
-               blkdev_issue_flush(sb->s_bdev, GFP_KERNEL);
+               blkdev_issue_flush(sb->s_bdev);
 
        return 0;
 }