aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
authorChristian Brauner <brauner@kernel.org>2025-03-06 10:59:18 +0100
committerChristian Brauner <brauner@kernel.org>2025-03-06 10:59:18 +0100
commit1743d385e704c41ef028697ef44eeab987d5f5a2 (patch)
treeececf9769480028751a4ae7ceb47c9f633c950b3 /fs/xfs
parent53cfafdd1530f86c2ef8ecbbcb9aeae4da115cb2 (diff)
parent13368df520f1d36c33b394553368cb23ae4afc18 (diff)
downloadath-1743d385e704c41ef028697ef44eeab987d5f5a2.tar.gz
Merge branch 'vfs-6.15.shared.iomap' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs
Bring in iomap changes that xfs relies on. Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 785f6bbf1406f..a81c3e943f206 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1627,7 +1627,8 @@ const struct file_operations xfs_file_operations = {
.fadvise = xfs_file_fadvise,
.remap_file_range = xfs_file_remap_range,
.fop_flags = FOP_MMAP_SYNC | FOP_BUFFER_RASYNC |
- FOP_BUFFER_WASYNC | FOP_DIO_PARALLEL_WRITE,
+ FOP_BUFFER_WASYNC | FOP_DIO_PARALLEL_WRITE |
+ FOP_DONTCACHE,
};
const struct file_operations xfs_dir_file_operations = {