Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edaf4369 authored by Al Viro's avatar Al Viro
Browse files

nfs: switch to ->write_iter() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f5674c31

fs/nfs/file.c

+7 −9
Original line number Diff line number Diff line
@@ -634,23 +634,21 @@ static int nfs_need_sync_write(struct file *filp, struct inode *inode) 
	return 0;

}



ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,

		       unsigned long nr_segs, loff_t pos)

ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)

{

	struct file *file = iocb->ki_filp;

	struct inode *inode = file_inode(file);

	unsigned long written = 0;

	ssize_t result;

	size_t count = iov_length(iov, nr_segs);

	struct iov_iter from;

	iov_iter_init(&from, WRITE, iov, nr_segs, count);

	size_t count = iov_iter_count(from);

	loff_t pos = iocb->ki_pos;



	result = nfs_key_timeout_notify(file, inode);

	if (result)

		return result;



	if (file->f_flags & O_DIRECT)

		return nfs_file_direct_write(iocb, &from, pos, true);

		return nfs_file_direct_write(iocb, from, pos, true);



	dprintk("NFS: write(%pD2, %zu@%Ld)\n",

		file, count, (long long) pos);
@@ -671,7 +669,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, 
	if (!count)

		goto out;



	result = generic_file_aio_write(iocb, iov, nr_segs, pos);

	result = generic_file_write_iter(iocb, from);

	if (result > 0)

		written = result;
@@ -941,9 +939,9 @@ EXPORT_SYMBOL_GPL(nfs_setlease); 
const struct file_operations nfs_file_operations = {

	.llseek		= nfs_file_llseek,

	.read		= new_sync_read,

	.write		= do_sync_write,

	.write		= new_sync_write,

	.read_iter	= nfs_file_read,

	.aio_write	= nfs_file_write,

	.write_iter	= nfs_file_write,

	.mmap		= nfs_file_mmap,

	.open		= nfs_file_open,

	.flush		= nfs_file_flush,

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ ssize_t nfs_file_read(struct kiocb *, struct iov_iter *); 
ssize_t nfs_file_splice_read(struct file *, loff_t *, struct pipe_inode_info *,

			     size_t, unsigned int);

int nfs_file_mmap(struct file *, struct vm_area_struct *);

ssize_t nfs_file_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);

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

int nfs_file_release(struct inode *, struct file *);

int nfs_lock(struct file *, int, struct file_lock *);

int nfs_flock(struct file *, int, struct file_lock *);

fs/nfs/nfs4file.c

+2 −2
Original line number Diff line number Diff line
@@ -119,9 +119,9 @@ nfs4_file_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
const struct file_operations nfs4_file_operations = {

	.llseek		= nfs_file_llseek,

	.read		= new_sync_read,

	.write		= do_sync_write,

	.write		= new_sync_write,

	.read_iter	= nfs_file_read,

	.aio_write	= nfs_file_write,

	.write_iter	= nfs_file_write,

	.mmap		= nfs_file_mmap,

	.open		= nfs4_file_open,

	.flush		= nfs_file_flush,