On Wed, 31 May 2023 at 09:51, Christoph Hellwig <hch@xxxxxx> wrote:
>
> Both callers of fuse_perform_write need to updated ki_pos, move it into
> common code.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
> ---
> fs/fuse/file.c | 23 ++++++++++-------------
> 1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 97d435874b14aa..e60e48bf392d49 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -1329,7 +1329,10 @@ static ssize_t fuse_perform_write(struct kiocb *iocb,
> fuse_write_update_attr(inode, pos, res);
> clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
>
> - return res > 0 ? res : err;
> + if (!res)
> + return err;
> + iocb->ki_pos += res;
> + return res;
> }
>
> static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
> @@ -1341,7 +1344,6 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
> struct inode *inode = mapping->host;
> ssize_t err;
> struct fuse_conn *fc = get_fuse_conn(inode);
> - loff_t endbyte = 0;
>
> if (fc->writeback_cache) {
> /* Update size (EOF optimization) and mode (SUID clearing) */
> @@ -1375,19 +1377,20 @@ 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 = iocb->ki_pos;
> + loff_t pos, endbyte;
> +
> written = generic_file_direct_write(iocb, from);
> if (written < 0 || !iov_iter_count(from))
> goto out;
>
> - pos += written;
> -
> - written_buffered = fuse_perform_write(iocb, mapping, from, pos);
> + written_buffered = fuse_perform_write(iocb, mapping, from,
> + iocb->ki_pos);
> if (written_buffered < 0) {
> err = written_buffered;
> goto out;
> }
> - endbyte = pos + written_buffered - 1;
> + pos = iocb->ki_pos - written_buffered;
> + endbyte = iocb->ki_pos - 1;
>
> err = filemap_write_and_wait_range(file->f_mapping, pos,
> endbyte);
> @@ -1399,17 +1402,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)
> endbyte >> PAGE_SHIFT);
>
> written += written_buffered;
> - iocb->ki_pos = pos + written_buffered;
> } else {
> written = fuse_perform_write(iocb, mapping, from, iocb->ki_pos);
> - if (written >= 0)
> - iocb->ki_pos += written;
> }
> out:
> inode_unlock(inode);
> - if (written > 0)
> - written = generic_write_sync(iocb, written);
Why remove generic_write_sync()? Definitely doesn't belong in this
patch even if there's a good reason.
Sorry, didn't notice this in the last round.
Thanks,
Miklos
