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

Commit 50b5551d authored by Al Viro's avatar Al Viro
Browse files

afs: switch to ->write_iter() 



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

fs/afs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ const struct file_operations afs_file_operations = { 
	.release	= afs_release,

	.llseek		= generic_file_llseek,

	.read		= new_sync_read,

	.write		= do_sync_write,

	.write		= new_sync_write,

	.read_iter	= generic_file_read_iter,

	.aio_write	= afs_file_write,

	.write_iter	= afs_file_write,

	.mmap		= generic_file_readonly_mmap,

	.splice_read	= generic_file_splice_read,

	.fsync		= afs_fsync,

fs/afs/internal.h

+1 −2
Original line number Diff line number Diff line
@@ -747,8 +747,7 @@ extern int afs_write_end(struct file *file, struct address_space *mapping, 
extern int afs_writepage(struct page *, struct writeback_control *);

extern int afs_writepages(struct address_space *, struct writeback_control *);

extern void afs_pages_written_back(struct afs_vnode *, struct afs_call *);

extern ssize_t afs_file_write(struct kiocb *, const struct iovec *,

			      unsigned long, loff_t);

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

extern int afs_writeback_all(struct afs_vnode *);

extern int afs_fsync(struct file *, loff_t, loff_t, int);

fs/afs/write.c

+5 −6
Original line number Diff line number Diff line
@@ -625,15 +625,14 @@ void afs_pages_written_back(struct afs_vnode *vnode, struct afs_call *call) 
/*

 * write to an AFS file

 */

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

		       unsigned long nr_segs, loff_t pos)

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

{

	struct afs_vnode *vnode = AFS_FS_I(file_inode(iocb->ki_filp));

	ssize_t result;

	size_t count = iov_length(iov, nr_segs);

	size_t count = iov_iter_count(from);



	_enter("{%x.%u},{%zu},%lu,",

	       vnode->fid.vid, vnode->fid.vnode, count, nr_segs);

	_enter("{%x.%u},{%zu},",

	       vnode->fid.vid, vnode->fid.vnode, count);



	if (IS_SWAPFILE(&vnode->vfs_inode)) {

		printk(KERN_INFO
@@ -644,7 +643,7 @@ ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov, 
	if (!count)

		return 0;



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

	result = generic_file_write_iter(iocb, from);

	if (IS_ERR_VALUE(result)) {

		_leave(" = %zd", result);

		return result;