diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-03 02:14:12 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 23:37:59 +0200 |
| commit | 3aa2d199f8eb8149a88005e88736d583cbc39d31 (patch) | |
| tree | 21d0a81d243152141bfc792b333fa629ec6f75fa /fs/nfs/file.c | |
| parent | fs/block_dev.c: switch to ->read_iter() (diff) | |
| download | linux-3aa2d199f8eb8149a88005e88736d583cbc39d31.tar.xz linux-3aa2d199f8eb8149a88005e88736d583cbc39d31.zip | |
nfs: switch to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index ead8f44f7973..200bdb0779f0 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -165,26 +165,21 @@ nfs_file_flush(struct file *file, fl_owner_t id) EXPORT_SYMBOL_GPL(nfs_file_flush); ssize_t -nfs_file_read(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t pos) +nfs_file_read(struct kiocb *iocb, struct iov_iter *to) { struct inode *inode = file_inode(iocb->ki_filp); - size_t count = iov_length(iov, nr_segs); ssize_t result; - struct iov_iter to; - - iov_iter_init(&to, READ, iov, nr_segs, count); if (iocb->ki_filp->f_flags & O_DIRECT) - return nfs_file_direct_read(iocb, &to, pos, true); + return nfs_file_direct_read(iocb, to, iocb->ki_pos, true); dprintk("NFS: read(%pD2, %zu@%lu)\n", iocb->ki_filp, - count, (unsigned long) pos); + iov_iter_count(to), (unsigned long) iocb->ki_pos); result = nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping); if (!result) { - result = generic_file_read_iter(iocb, &to); + result = generic_file_read_iter(iocb, to); if (result > 0) nfs_add_stats(inode, NFSIOS_NORMALREADBYTES, result); } @@ -945,9 +940,9 @@ EXPORT_SYMBOL_GPL(nfs_setlease); const struct file_operations nfs_file_operations = { .llseek = nfs_file_llseek, - .read = do_sync_read, + .read = new_sync_read, .write = do_sync_write, - .aio_read = nfs_file_read, + .read_iter = nfs_file_read, .aio_write = nfs_file_write, .mmap = nfs_file_mmap, .open = nfs_file_open, |