aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-04 22:38:00 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:32:45 -0400
commita6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e (patch)
treec0f054759a0b9c26881109968ad018fe759af458 /fs/nfs
parent16b1f05d7f5ab4ce570963aca5f3b2b5d21822fa (diff)
get rid of pointless iov_length() in ->direct_IO()
all callers have iov_length(iter->iov, iter->nr_segs) == iov_iter_count(iter) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/direct.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 21723149668b..1d34f454989e 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -486,9 +486,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter,
486 struct nfs_direct_req *dreq; 486 struct nfs_direct_req *dreq;
487 struct nfs_lock_context *l_ctx; 487 struct nfs_lock_context *l_ctx;
488 ssize_t result = -EINVAL; 488 ssize_t result = -EINVAL;
489 size_t count; 489 size_t count = iov_iter_count(iter);
490
491 count = iov_length(iter->iov, iter->nr_segs);
492 nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count); 490 nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count);
493 491
494 dfprintk(FILE, "NFS: direct read(%pD2, %zd@%Ld)\n", 492 dfprintk(FILE, "NFS: direct read(%pD2, %zd@%Ld)\n",
@@ -877,7 +875,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
877 get_dreq(dreq); 875 get_dreq(dreq);
878 atomic_inc(&inode->i_dio_count); 876 atomic_inc(&inode->i_dio_count);
879 877
880 NFS_I(dreq->inode)->write_io += iov_length(iter->iov, iter->nr_segs); 878 NFS_I(dreq->inode)->write_io += iov_iter_count(iter);
881 for (seg = 0; seg < iter->nr_segs; seg++) { 879 for (seg = 0; seg < iter->nr_segs; seg++) {
882 const struct iovec *vec = &iter->iov[seg]; 880 const struct iovec *vec = &iter->iov[seg];
883 result = nfs_direct_write_schedule_segment(&desc, vec, pos, uio); 881 result = nfs_direct_write_schedule_segment(&desc, vec, pos, uio);
@@ -936,9 +934,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
936 struct nfs_direct_req *dreq; 934 struct nfs_direct_req *dreq;
937 struct nfs_lock_context *l_ctx; 935 struct nfs_lock_context *l_ctx;
938 loff_t end; 936 loff_t end;
939 size_t count; 937 size_t count = iov_iter_count(iter);
940
941 count = iov_length(iter->iov, iter->nr_segs);
942 end = (pos + count - 1) >> PAGE_CACHE_SHIFT; 938 end = (pos + count - 1) >> PAGE_CACHE_SHIFT;
943 939
944 nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count); 940 nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count);