public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 09:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

afs: switch to ->write_iter()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-04-03 14:13:46 -04:00
parent da56e45b6e
commit 50b5551d17
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/afs/file.c
View file

@ -32,9 +32,9 @@ const struct file_operations afs_file_operations = {
.release = afs_release, .release = afs_release,
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = new_sync_read, .read = new_sync_read,
.write = do_sync_write, .write = new_sync_write,
.read_iter = generic_file_read_iter, .read_iter = generic_file_read_iter,
.aio_write = afs_file_write, .write_iter = afs_file_write,
.mmap = generic_file_readonly_mmap, .mmap = generic_file_readonly_mmap,
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
.fsync = afs_fsync, .fsync = afs_fsync,

3
fs/afs/internal.h
View file

@ -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_writepage(struct page *, struct writeback_control *);
extern int afs_writepages(struct address_space *, 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 void afs_pages_written_back(struct afs_vnode *, struct afs_call *);
extern ssize_t afs_file_write(struct kiocb *, const struct iovec *, extern ssize_t afs_file_write(struct kiocb *, struct iov_iter *);
unsigned long, loff_t);
extern int afs_writeback_all(struct afs_vnode *); extern int afs_writeback_all(struct afs_vnode *);
extern int afs_fsync(struct file *, loff_t, loff_t, int); extern int afs_fsync(struct file *, loff_t, loff_t, int);

11
fs/afs/write.c
View file

@ -625,15 +625,14 @@ void afs_pages_written_back(struct afs_vnode *vnode, struct afs_call *call)
/* /*
* write to an AFS file * write to an AFS file
*/ */
ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov, ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *from)
unsigned long nr_segs, loff_t pos)
{ {
struct afs_vnode *vnode = AFS_FS_I(file_inode(iocb->ki_filp)); struct afs_vnode *vnode = AFS_FS_I(file_inode(iocb->ki_filp));
ssize_t result; ssize_t result;
size_t count = iov_length(iov, nr_segs); size_t count = iov_iter_count(from);
_enter("{%x.%u},{%zu},%lu,", _enter("{%x.%u},{%zu},",
vnode->fid.vid, vnode->fid.vnode, count, nr_segs); vnode->fid.vid, vnode->fid.vnode, count);
if (IS_SWAPFILE(&vnode->vfs_inode)) { if (IS_SWAPFILE(&vnode->vfs_inode)) {
printk(KERN_INFO printk(KERN_INFO
@ -644,7 +643,7 @@ ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov,
if (!count) if (!count)
return 0; return 0;
result = generic_file_aio_write(iocb, iov, nr_segs, pos); result = generic_file_write_iter(iocb, from);
if (IS_ERR_VALUE(result)) { if (IS_ERR_VALUE(result)) {
_leave(" = %zd", result); _leave(" = %zd", result);
return result; return result;