Commit 800ba295 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fs: Pass an iocb to generic_perform_write() 



We can extract both the file pointer and the pos from the iocb.
This simplifies each caller as well as allowing generic_perform_write()
to see more of the iocb contents in the future.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Reviewed-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b2403a61

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		 * are pending vmtruncate. So write and vmtruncate

		 * can not run at the same time

		 */

		written = generic_perform_write(file, from, pos);

		written = generic_perform_write(iocb, from);

		if (likely(written >= 0))

			iocb->ki_pos = pos + written;

		ceph_end_io_write(inode);

fs/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *iocb, 
		goto out;



	current->backing_dev_info = inode_to_bdi(inode);

	ret = generic_perform_write(iocb->ki_filp, from, iocb->ki_pos);

	ret = generic_perform_write(iocb, from);

	current->backing_dev_info = NULL;



out:

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -4448,7 +4448,7 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb, 
		return -EOPNOTSUPP;



	current->backing_dev_info = inode_to_bdi(inode);

	ret = generic_perform_write(file, from, iocb->ki_pos);

	ret = generic_perform_write(iocb, from);

	current->backing_dev_info = NULL;



	if (ret > 0) {

fs/nfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) 
	result = generic_write_checks(iocb, from);

	if (result > 0) {

		current->backing_dev_info = inode_to_bdi(inode);

		result = generic_perform_write(file, from, iocb->ki_pos);

		result = generic_perform_write(iocb, from);

		current->backing_dev_info = NULL;

	}

	nfs_end_io_write(inode);

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2999,7 +2999,7 @@ extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); 
extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);

extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);

extern ssize_t generic_file_direct_write(struct kiocb *, struct iov_iter *);

extern ssize_t generic_perform_write(struct file *, struct iov_iter *, loff_t);

ssize_t generic_perform_write(struct kiocb *, struct iov_iter *);



ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *ppos,

		rwf_t flags);