Commit 182c25e9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

filemap: update ki_pos in generic_perform_write 

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

Link: https://lkml.kernel.org/r/20230601145904.1385409-4-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: Chao Yu <chao@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 936e114a

fs/ceph/file.c

+0 −2
Original line number Diff line number Diff line
@@ -1891,8 +1891,6 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		 * 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);

	}

fs/ext4/file.c

+3 −6
Original line number Diff line number Diff line
@@ -289,12 +289,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);

	}



	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,

fs/f2fs/file.c

+0 −1
Original line number Diff line number Diff line
@@ -4520,7 +4520,6 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb, 
	ret = generic_perform_write(iocb, from);



	if (ret > 0) {

		iocb->ki_pos += ret;

		f2fs_update_iostat(F2FS_I_SB(inode), inode,

						APP_BUFFERED_IO, ret);

	}

fs/nfs/file.c

+0 −1
Original line number Diff line number Diff line
@@ -655,7 +655,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) {

mm/filemap.c

+4 −4
Original line number Diff line number Diff line
@@ -3930,7 +3930,10 @@ ssize_t generic_perform_write(struct kiocb *iocb, struct iov_iter *i) 
		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);
@@ -4007,7 +4010,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,
@@ -4020,8 +4022,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:

	return written ? written : err;