diff options
| author | Tyler Hicks <code@tyhicks.com> | 2021-04-19 04:39:17 +0000 |
|---|---|---|
| committer | Tyler Hicks <code@tyhicks.com> | 2021-04-19 04:39:17 +0000 |
| commit | b7f8f259896f669f131713b0c74ba4d008daa71d (patch) | |
| tree | cb42f2b5e67674b011fcca54594213f43c086e8b /fs/reiserfs/file.c | |
| parent | 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 (diff) | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff) | |
Merge tag 'v5.12-rc7' into ecryptfs/next
Required to pick up idmapped mount changes which changed some function
parameters.
Diffstat (limited to 'fs/reiserfs/file.c')
| -rw-r--r-- | fs/reiserfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 0b641ae694f1..1db0254bc38b 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -159,7 +159,7 @@ static int reiserfs_sync_file(struct file *filp, loff_t start, loff_t end, barrier_done = reiserfs_commit_for_inode(inode); reiserfs_write_unlock(inode->i_sb); if (barrier_done != 1 && reiserfs_barrier_flush(inode->i_sb)) - blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL); + blkdev_issue_flush(inode->i_sb->s_bdev); inode_unlock(inode); if (barrier_done < 0) return barrier_done; |