diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-05 19:28:09 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:49 -0400 |
commit | 71d8e532b1549a478e6a6a8a44f309d050294d00 (patch) | |
tree | 58b40c17cbb806c94aa07121a8b010d16f825d27 /fs/nfs | |
parent | ed978a811ec528dbe40243605c3afab55892f722 (diff) |
start adding the tag to iov_iter
For now, just use the same thing we pass to ->direct_IO() - it's all
iovec-based at the moment. Pass it explicitly to iov_iter_init() and
account for kvec vs. iovec in there, by the same kludge NFS ->direct_IO()
uses.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index a352bc6d613f..ead8f44f7973 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -173,7 +173,7 @@ nfs_file_read(struct kiocb *iocb, const struct iovec *iov, | |||
173 | ssize_t result; | 173 | ssize_t result; |
174 | struct iov_iter to; | 174 | struct iov_iter to; |
175 | 175 | ||
176 | iov_iter_init(&to, iov, nr_segs, count, 0); | 176 | iov_iter_init(&to, READ, iov, nr_segs, count); |
177 | 177 | ||
178 | if (iocb->ki_filp->f_flags & O_DIRECT) | 178 | if (iocb->ki_filp->f_flags & O_DIRECT) |
179 | return nfs_file_direct_read(iocb, &to, pos, true); | 179 | return nfs_file_direct_read(iocb, &to, pos, true); |
@@ -648,7 +648,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, | |||
648 | ssize_t result; | 648 | ssize_t result; |
649 | size_t count = iov_length(iov, nr_segs); | 649 | size_t count = iov_length(iov, nr_segs); |
650 | struct iov_iter from; | 650 | struct iov_iter from; |
651 | iov_iter_init(&from, iov, nr_segs, count, 0); | 651 | iov_iter_init(&from, WRITE, iov, nr_segs, count); |
652 | 652 | ||
653 | result = nfs_key_timeout_notify(file, inode); | 653 | result = nfs_key_timeout_notify(file, inode); |
654 | if (result) | 654 | if (result) |