On Wed, 31 May 2023 at 09:51, Christoph Hellwig <hch@xxxxxx> wrote:
>
> Use the generic direct_write_fallback helper instead of duplicating the
> logic.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
> ---
> fs/fuse/file.c | 24 ++----------------------
> 1 file changed, 2 insertions(+), 22 deletions(-)
>
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 025973ad813e05..7a72dc0a691201 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -1340,7 +1340,6 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
> struct file *file = iocb->ki_filp;
> struct address_space *mapping = file->f_mapping;
> ssize_t written = 0;
> - ssize_t written_buffered = 0;
> struct inode *inode = mapping->host;
> ssize_t err;
> struct fuse_conn *fc = get_fuse_conn(inode);
> @@ -1377,30 +1376,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
> goto out;
>
> if (iocb->ki_flags & IOCB_DIRECT) {
> - loff_t pos, endbyte;
> -
> written = generic_file_direct_write(iocb, from);
> if (written < 0 || !iov_iter_count(from))
> goto out;
> -
> - written_buffered = fuse_perform_write(iocb, from);
> - if (written_buffered < 0) {
> - err = written_buffered;
> - goto out;
> - }
> - pos = iocb->ki_pos - written_buffered;
> - endbyte = iocb->ki_pos - 1;
> -
> - err = filemap_write_and_wait_range(file->f_mapping, pos,
> - endbyte);
> - if (err)
> - goto out;
> -
> - invalidate_mapping_pages(file->f_mapping,
> - pos >> PAGE_SHIFT,
> - endbyte >> PAGE_SHIFT);
> -
> - written += written_buffered;
> + written = direct_write_fallback(iocb, from, written,
> + generic_perform_write(iocb, from));
This should use fuse_perform_write().
Last version of the patch was correct; copy-paste error?
Thanks,
Miklos
