[Cluster-devel] [PATCH 11/13] fuse: update ki_pos in fuse_perform_write

[Christoph Hellwig]

Both callers of fuse_perform_write need to updated ki_pos, move it into
common code.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 fs/fuse/file.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 89d97f6188e05e..fd2f27f2144750 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)
@@ -1378,42 +1381,36 @@ 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;
                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;
+               endbyte = iocb->ki_pos + written_buffered - 1;
 
-               err = filemap_write_and_wait_range(file->f_mapping, pos,
+               err = filemap_write_and_wait_range(file->f_mapping,
+                                                  iocb->ki_pos,
                                                   endbyte);
                if (err)
                        goto out;
 
                invalidate_mapping_pages(file->f_mapping,
-                                        pos >> PAGE_SHIFT,
+                                        iocb->ki_pos >> PAGE_SHIFT,
                                         endbyte >> PAGE_SHIFT);
 
                written += written_buffered;
-               iocb->ki_pos = pos + written_buffered;
+               iocb->ki_pos += written_buffered;
        } else {
                written = fuse_perform_write(iocb, mapping, from, iocb->ki_pos);
-               if (written >= 0)
-                       iocb->ki_pos += written;
        }
 out:
        current->backing_dev_info = NULL;
        inode_unlock(inode);
-       if (written > 0)
-               written = generic_write_sync(iocb, written);
-
        return written ? written : err;
 }
 
-- 
2.39.2