diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2021-02-22 10:14:24 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2021-02-22 10:14:24 -0700 |
| commit | 72d6e4871f0457dc9e498f8437ea344ee6b78075 (patch) | |
| tree | 44a6975d7f0818086e34b8e84e3164527fac36f4 /fs/jbd2/commit.c | |
| parent | b9abef43a08ef7faa33477cccb0c08c64eb2b8bf (diff) | |
| parent | 3e10585335b7967326ca7b4118cada0d2d00a2ab (diff) | |
Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/next
Update to new follow_pte() definition
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 b121d7d434c6..3cc4ab2ba7f4 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -825,7 +825,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_NOFS); + blkdev_issue_flush(journal->j_fs_dev); /* Done it all: now write the commit record asynchronously. */ if (jbd2_has_feature_async_commit(journal)) { @@ -932,7 +932,7 @@ start_journal_io: stats.run.rs_blocks_logged++; if (jbd2_has_feature_async_commit(journal) && journal->j_flags & JBD2_BARRIER) { - blkdev_issue_flush(journal->j_dev, GFP_NOFS); + blkdev_issue_flush(journal->j_dev); } if (err) |