diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-03-06 10:59:18 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-03-06 10:59:18 +0100 |
| commit | 1743d385e704c41ef028697ef44eeab987d5f5a2 (patch) | |
| tree | ececf9769480028751a4ae7ceb47c9f633c950b3 /fs/iomap | |
| parent | 53cfafdd1530f86c2ef8ecbbcb9aeae4da115cb2 (diff) | |
| parent | 13368df520f1d36c33b394553368cb23ae4afc18 (diff) | |
| download | ath-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/iomap')
| -rw-r--r-- | fs/iomap/buffered-io.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index ea5e32d810d50..d52cfdc299c4e 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -594,6 +594,8 @@ struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len) if (iter->flags & IOMAP_NOWAIT) fgp |= FGP_NOWAIT; + if (iter->flags & IOMAP_DONTCACHE) + fgp |= FGP_DONTCACHE; fgp |= fgf_set_order(len); return __filemap_get_folio(iter->inode->i_mapping, pos >> PAGE_SHIFT, @@ -1019,6 +1021,8 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, if (iocb->ki_flags & IOCB_NOWAIT) iter.flags |= IOMAP_NOWAIT; + if (iocb->ki_flags & IOCB_DONTCACHE) + iter.flags |= IOMAP_DONTCACHE; while ((ret = iomap_iter(&iter, ops)) > 0) iter.status = iomap_write_iter(&iter, i); |