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 /mm/filemap.c | |
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 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index a7f79e90209c..3aeaf2df4135 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -1730,7 +1730,7 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, | |||
1730 | size_t count = iov_length(iov, nr_segs); | 1730 | size_t count = iov_length(iov, nr_segs); |
1731 | struct iov_iter i; | 1731 | struct iov_iter i; |
1732 | 1732 | ||
1733 | iov_iter_init(&i, iov, nr_segs, count, 0); | 1733 | iov_iter_init(&i, READ, iov, nr_segs, count); |
1734 | return generic_file_read_iter(iocb, &i); | 1734 | return generic_file_read_iter(iocb, &i); |
1735 | } | 1735 | } |
1736 | EXPORT_SYMBOL(generic_file_aio_read); | 1736 | EXPORT_SYMBOL(generic_file_aio_read); |
@@ -2596,7 +2596,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
2596 | if (err) | 2596 | if (err) |
2597 | goto out; | 2597 | goto out; |
2598 | 2598 | ||
2599 | iov_iter_init(&from, iov, nr_segs, count, 0); | 2599 | iov_iter_init(&from, WRITE, iov, nr_segs, count); |
2600 | 2600 | ||
2601 | /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */ | 2601 | /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */ |
2602 | if (unlikely(file->f_flags & O_DIRECT)) { | 2602 | if (unlikely(file->f_flags & O_DIRECT)) { |