diff options
author | Christoph Hellwig <hch@lst.de> | 2016-04-07 11:51:58 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-01 19:58:39 -0400 |
commit | c8b8e32d700fe943a935e435ae251364d016c497 (patch) | |
tree | 956e582a123c6b2761e80901bdaaedc5ba4137e3 /mm/filemap.c | |
parent | 13712713caba0c1b8c2c0070a4c1f4487def8dee (diff) |
direct-io: eliminate the offset argument to ->direct_IO
Including blkdev_direct_IO and dax_do_io. It has to be ki_pos to actually
work, so eliminate the superflous argument.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index e7108c31346d..cb36db9f4107 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -1853,8 +1853,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) | |||
1853 | iocb->ki_pos + count - 1); | 1853 | iocb->ki_pos + count - 1); |
1854 | if (!retval) { | 1854 | if (!retval) { |
1855 | struct iov_iter data = *iter; | 1855 | struct iov_iter data = *iter; |
1856 | retval = mapping->a_ops->direct_IO(iocb, &data, | 1856 | retval = mapping->a_ops->direct_IO(iocb, &data); |
1857 | iocb->ki_pos); | ||
1858 | } | 1857 | } |
1859 | 1858 | ||
1860 | if (retval > 0) { | 1859 | if (retval > 0) { |
@@ -2538,7 +2537,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) | |||
2538 | } | 2537 | } |
2539 | 2538 | ||
2540 | data = *from; | 2539 | data = *from; |
2541 | written = mapping->a_ops->direct_IO(iocb, &data, pos); | 2540 | written = mapping->a_ops->direct_IO(iocb, &data); |
2542 | 2541 | ||
2543 | /* | 2542 | /* |
2544 | * Finally, try again to invalidate clean pages which might have been | 2543 | * Finally, try again to invalidate clean pages which might have been |