Skip to content

Commit

Permalink
give ->direct_IO() a copy of iov_iter
Browse files Browse the repository at this point in the history
the thing is, we want to advance what's given to ->direct_IO() as we
are forming the request; however, the callers care about the amount
of data actually transferred, not the amount we tried to transfer.
It's more convenient to allow ->direct_IO() instances do use
iov_iter_advance() on the copy of iov_iter, leaving the actual
advancing of the original to caller.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed May 6, 2014
1 parent 31b1403 commit 26978b8
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions mm/filemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1699,8 +1699,10 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
size = i_size_read(inode);
retval = filemap_write_and_wait_range(mapping, pos,
pos + count - 1);
if (!retval)
retval = mapping->a_ops->direct_IO(READ, iocb, &i, pos);
if (!retval) {
struct iov_iter data = i;
retval = mapping->a_ops->direct_IO(READ, iocb, &data, pos);
}

if (retval > 0) {
*ppos = pos + retval;
Expand Down Expand Up @@ -2351,6 +2353,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from,
ssize_t written;
size_t write_len;
pgoff_t end;
struct iov_iter data;

if (count != ocount)
from->nr_segs = iov_shorten((struct iovec *)from->iov, from->nr_segs, count);
Expand Down Expand Up @@ -2382,7 +2385,8 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from,
}
}

written = mapping->a_ops->direct_IO(WRITE, iocb, from, pos);
data = *from;
written = mapping->a_ops->direct_IO(WRITE, iocb, &data, pos);

/*
* Finally, try again to invalidate clean pages which might have been
Expand Down

0 comments on commit 26978b8

Please sign in to comment.