filemap: update ki_pos in generic_perform_write

All callers of generic_perform_write need to updated ki_pos, move it into
common code.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index f4d8bf7dec88a8eddeffbb0de171514566c6fa21..feeb9882ef635a3e215dc9fc0c87a3770707ef69 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1894,8 +1894,6 @@ retry_snap:
                 * can not run at the same time
                 */
                written = generic_perform_write(iocb, from);
-               if (likely(written >= 0))
-                       iocb->ki_pos = pos + written;
                ceph_end_io_write(inode);
        }
 

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 0b8b4499e5ca18a7f437015dce1d9d7071b064e7..1026acaf1235a00d2d407d02f3542e272b31b451 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -291,12 +291,9 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *iocb,
 
 out:
        inode_unlock(inode);
-       if (likely(ret > 0)) {
-               iocb->ki_pos += ret;
-               ret = generic_write_sync(iocb, ret);
-       }
-
-       return ret;
+       if (unlikely(ret <= 0))
+               return ret;
+       return generic_write_sync(iocb, ret);
 }
 
 static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f4ab23efcf85f872b3de430e50459b67687abd40..5a9ae054b6da7d92c7c3aa808412c6e0dc0d820e 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4511,7 +4511,6 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb,
        current->backing_dev_info = NULL;
 
        if (ret > 0) {
-               iocb->ki_pos += ret;
                f2fs_update_iostat(F2FS_I_SB(inode), inode,
                                                APP_BUFFERED_IO, ret);
        }

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 893625eacab9faf9a9e4203c7c8aa92fb474aaa3..abdae2b29369be0a4dbc0432ff061d11d5856bd5 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -666,7 +666,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
                goto out;
 
        written = result;
-       iocb->ki_pos += written;
        nfs_add_stats(inode, NFSIOS_NORMALWRITTENBYTES, written);
 
        if (mntflags & NFS_MOUNT_WRITE_EAGER) {

diff --git a/mm/filemap.c b/mm/filemap.c
index 2723104cc06a12477a002fff87fe7fe7ec8ccd66..0110bde3708b3fa7af444cd1980d9b2f7c5fbf48 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3960,7 +3960,10 @@ again:
                balance_dirty_pages_ratelimited(mapping);
        } while (iov_iter_count(i));
 
-       return written ? written : status;
+       if (!written)
+               return status;
+       iocb->ki_pos += written;
+       return written;
 }
 EXPORT_SYMBOL(generic_perform_write);
 
@@ -4039,7 +4042,6 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                endbyte = pos + status - 1;
                err = filemap_write_and_wait_range(mapping, pos, endbyte);
                if (err == 0) {
-                       iocb->ki_pos = endbyte + 1;
                        written += status;
                        invalidate_mapping_pages(mapping,
                                                 pos >> PAGE_SHIFT,
@@ -4052,8 +4054,6 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                }
        } else {
                written = generic_perform_write(iocb, from);
-               if (likely(written > 0))
-                       iocb->ki_pos += written;
        }
 out:
        current->backing_dev_info = NULL;