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/ext4/fast_commit.c | |
| parent | vfio/pci: remove CONFIG_VFIO_PCI_ZDEV from Kconfig (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | wireguard-linux-72d6e4871f0457dc9e498f8437ea344ee6b78075.tar.xz wireguard-linux-72d6e4871f0457dc9e498f8437ea344ee6b78075.zip | |
Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/next
Update to new follow_pte() definition
Diffstat (limited to 'fs/ext4/fast_commit.c')
| -rw-r--r-- | fs/ext4/fast_commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 0a14a7c87bf8..6e8208acfc62 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1076,7 +1076,7 @@ static int ext4_fc_perform_commit(journal_t *journal) * flush before we start writing fast commit blocks. */ if (journal->j_fs_dev != journal->j_dev) - blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS); + blkdev_issue_flush(journal->j_fs_dev); blk_start_plug(&plug); if (sbi->s_fc_bytes == 0) { @@ -1535,7 +1535,7 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl) out: iput(inode); if (!ret) - blkdev_issue_flush(sb->s_bdev, GFP_KERNEL); + blkdev_issue_flush(sb->s_bdev); return 0; } |