diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
| commit | 65c98038394e65228490ef44353f5d4665690f55 (patch) | |
| tree | c7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /fs/jbd2/commit.c | |
| parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
| parent | b2f44dc29bfab77b10f3a709f14677f51ce3a4cd (diff) | |
| download | olio-linux-3.10-65c98038394e65228490ef44353f5d4665690f55.tar.xz olio-linux-3.10-65c98038394e65228490ef44353f5d4665690f55.zip | |
Merge branch 'fixes-non-critical' into cleanup-devices
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 806525a7269..840f70f5079 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -723,7 +723,7 @@ start_journal_io: if (commit_transaction->t_need_data_flush && (journal->j_fs_dev != journal->j_dev) && (journal->j_flags & JBD2_BARRIER)) - blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL); + blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL); /* Done it all: now write the commit record asynchronously. */ if (JBD2_HAS_INCOMPAT_FEATURE(journal, @@ -859,7 +859,7 @@ wait_for_iobuf: if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) && journal->j_flags & JBD2_BARRIER) { - blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL); + blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL); } if (err) |