diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:42 +0200 |
| commit | 436281c9a110ff16c1fb396add5dd944ee92cf36 (patch) | |
| tree | afda86db9e89d41ca49a8311673b994a82d16d42 /fs/jbd2/commit.c | |
| parent | Merge branch 'tip/sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into sched/core (diff) | |
| parent | IA32 emulation: Fix build problem for modular ia32 a.out support (diff) | |
| download | linux-dev-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.xz linux-dev-436281c9a110ff16c1fb396add5dd944ee92cf36.zip | |
Merge branch 'linus' into sched/core
Merge reason: We were on a pretty old base, refresh before moving on.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 806525a7269c..840f70f50792 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) |