diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-01-28 14:35:13 -0800 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2022-01-30 09:36:28 -0800 |
| commit | 7ae9f5cb676afbf7121e417f9bde71a2a2819a5c (patch) | |
| tree | 36803e245ef0fa5a06bce92067bdea74cdfa7d05 | |
| parent | ed133bb8ccba2d833688c4d808b6549186b53bd1 (diff) | |
xfs: flush log after fallocate for sync mounts and sync inodes
Since we've started treating fallocate more like a file write, we should
flush the log to disk if the user has asked for synchronous writes
either by setting it via fcntl flags, or inode flags, or with the sync
mount option. We've already got a helper for this, so use it.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
| -rw-r--r-- | fs/xfs/xfs_file.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 99f245978762..596533b713a8 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -896,6 +896,21 @@ xfs_break_layouts( return error; } +/* Does this file, inode, or mount want synchronous writes? */ +static inline bool xfs_file_sync_writes(struct file *filp) +{ + struct xfs_inode *ip = XFS_I(file_inode(filp)); + + if (xfs_has_wsync(ip->i_mount)) + return true; + if (filp->f_flags & (__O_SYNC | O_DSYNC)) + return true; + if (IS_SYNC(file_inode(filp))) + return true; + + return false; +} + #define XFS_FALLOC_FL_SUPPORTED \ (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE | \ @@ -1069,7 +1084,7 @@ xfs_file_fallocate( * don't need to do that again. This must be committed before the size * change so that we don't trim post-EOF preallocations. */ - if (file->f_flags & O_DSYNC) + if (xfs_file_sync_writes(file)) flags |= XFS_PREALLOC_SYNC; if (flags) { flags |= XFS_PREALLOC_INVISIBLE; @@ -1130,21 +1145,6 @@ xfs_file_fadvise( return ret; } -/* Does this file, inode, or mount want synchronous writes? */ -static inline bool xfs_file_sync_writes(struct file *filp) -{ - struct xfs_inode *ip = XFS_I(file_inode(filp)); - - if (xfs_has_wsync(ip->i_mount)) - return true; - if (filp->f_flags & (__O_SYNC | O_DSYNC)) - return true; - if (IS_SYNC(file_inode(filp))) - return true; - - return false; -} - STATIC loff_t xfs_file_remap_range( struct file *file_in, |