Page flush and invalidation in fuse_direct_io can when FOPEN_DIRECT_IO
is set can be removed, as the code path is now always via
generic_file_direct_write, which already does it.
Cc: Hao Xu <howeyxu@xxxxxxxxxxx>
Cc: Miklos Szeredi <miklos@xxxxxxxxxx>
Cc: Dharmendra Singh <dsingh@xxxxxxx>
Cc: linux-fsdevel@xxxxxxxxxxxxxxx
Signed-off-by: Bernd Schubert <bschubert@xxxxxxx>
---
fs/fuse/file.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 09277a54b711..eab105ef4640 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1473,20 +1473,11 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
int err = 0;
struct fuse_io_args *ia;
unsigned int max_pages;
- bool fopen_direct_io = ff->open_flags & FOPEN_DIRECT_IO;
-
max_pages = iov_iter_npages(iter, fc->max_pages);
ia = fuse_io_alloc(io, max_pages);
if (!ia)
return -ENOMEM;
- if (fopen_direct_io && fc->direct_io_relax) {
- res = filemap_write_and_wait_range(mapping, pos, pos + count - 1);
- if (res) {
- fuse_io_free(ia);
- return res;
- }
- }
if (!cuse && fuse_range_is_writeback(inode, idx_from, idx_to)) {
if (!write)
inode_lock(inode);
@@ -1495,14 +1486,6 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
inode_unlock(inode);
}
- if (fopen_direct_io && write) {
- res = invalidate_inode_pages2_range(mapping, idx_from, idx_to);
- if (res) {
- fuse_io_free(ia);
- return res;
- }
- }
-
io->should_dirty = !write && user_backed_iter(iter);
while (count) {
ssize_t nres;
--
2.39.2
