diff options
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index eef6979821a..36c2e800e73 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
| @@ -683,7 +683,7 @@ start_journal_io: | |||
| 683 | if (commit_transaction->t_need_data_flush && | 683 | if (commit_transaction->t_need_data_flush && |
| 684 | (journal->j_fs_dev != journal->j_dev) && | 684 | (journal->j_fs_dev != journal->j_dev) && |
| 685 | (journal->j_flags & JBD2_BARRIER)) | 685 | (journal->j_flags & JBD2_BARRIER)) |
| 686 | blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL); | 686 | blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL); |
| 687 | 687 | ||
| 688 | /* Done it all: now write the commit record asynchronously. */ | 688 | /* Done it all: now write the commit record asynchronously. */ |
| 689 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, | 689 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, |
| @@ -819,7 +819,7 @@ wait_for_iobuf: | |||
| 819 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, | 819 | if (JBD2_HAS_INCOMPAT_FEATURE(journal, |
| 820 | JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) && | 820 | JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) && |
| 821 | journal->j_flags & JBD2_BARRIER) { | 821 | journal->j_flags & JBD2_BARRIER) { |
| 822 | blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL); | 822 | blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL); |
| 823 | } | 823 | } |
| 824 | 824 | ||
| 825 | if (err) | 825 | if (err) |
