diff options
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index f204e27f44d1..cb43c605cfaa 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -684,8 +684,7 @@ start_journal_io: | |||
684 | if (commit_transaction->t_flushed_data_blocks && | 684 | if (commit_transaction->t_flushed_data_blocks && |
685 | (journal->j_fs_dev != journal->j_dev) && | 685 | (journal->j_fs_dev != journal->j_dev) && |
686 | (journal->j_flags & JBD2_BARRIER)) | 686 | (journal->j_flags & JBD2_BARRIER)) |
687 | blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL, | 687 | blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL); |
688 | BLKDEV_IFL_WAIT); | ||
689 | 688 | ||
690 | /* Done it all: now write the commit record asynchronously. */ | 689 | /* Done it all: now write the commit record asynchronously. */ |
691 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, | 690 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, |
@@ -810,8 +809,7 @@ wait_for_iobuf: | |||
810 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, | 809 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, |
811 | JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) && | 810 | JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) && |
812 | journal->j_flags & JBD2_BARRIER) { | 811 | journal->j_flags & JBD2_BARRIER) { |
813 | blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL, | 812 | blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL); |
814 | BLKDEV_IFL_WAIT); | ||
815 | } | 813 | } |
816 | 814 | ||
817 | if (err) | 815 | if (err) |