aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-04 23:12:29 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:39:45 -0400
commit62a8067a7f35dba2de501c9cb00e4cf36da90bc0 (patch)
treebb008456891c13b9d8a25825a10074efb861cd88 /fs
parent81055e584f9d743cb13dc7944923d817c20f089d (diff)
bio_vec-backed iov_iter
New variant of iov_iter - ITER_BVEC in iter->type, backed with bio_vec array instead of iovec one. Primitives taught to deal with such beasts, __swap_write() switched to using that kind of iov_iter. Note that bio_vec is just a <page, offset, length> triple - there's nothing block-specific about it. I've left the definition where it was, but took it from under ifdef CONFIG_BLOCK. Next target: ->splice_write()... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 7fbc803cf51d..b2dae9d1437c 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1288,7 +1288,7 @@ static int fuse_get_user_pages(struct fuse_req *req, struct iov_iter *ii,
1288 size_t nbytes = 0; /* # bytes already packed in req */ 1288 size_t nbytes = 0; /* # bytes already packed in req */
1289 1289
1290 /* Special case for kernel I/O: can copy directly into the buffer */ 1290 /* Special case for kernel I/O: can copy directly into the buffer */
1291 if (ii->type & REQ_KERNEL) { 1291 if (ii->type & ITER_KVEC) {
1292 unsigned long user_addr = fuse_get_user_addr(ii); 1292 unsigned long user_addr = fuse_get_user_addr(ii);
1293 size_t frag_size = fuse_get_frag_size(ii, *nbytesp); 1293 size_t frag_size = fuse_get_frag_size(ii, *nbytesp);
1294 1294