redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

filemap: remove pos variables in generic_file_read_iter 

Just use ki_pos directly to make everyones life easier.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
hifive-unleashed-5.1
Christoph Hellwig 2016-04-07 08:51:55 -07:00 committed by Al Viro
parent bf16200689
commit c64fb5c744
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mm/filemap.c
View File

@ -1838,8 +1838,6 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
ssize_t retval = 0; ssize_t retval = 0;
loff_t *ppos = &iocb->ki_pos;
loff_t pos = *ppos;
size_t count = iov_iter_count(iter); size_t count = iov_iter_count(iter);
if (!count) if (!count)
@ -1851,15 +1849,16 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
loff_t size; loff_t size;
size = i_size_read(inode); size = i_size_read(inode);
retval = filemap_write_and_wait_range(mapping, pos, retval = filemap_write_and_wait_range(mapping, iocb->ki_pos,
pos + count - 1); iocb->ki_pos + count - 1);
if (!retval) { if (!retval) {
struct iov_iter data = *iter; struct iov_iter data = *iter;
retval = mapping->a_ops->direct_IO(iocb, &data, pos); retval = mapping->a_ops->direct_IO(iocb, &data,
iocb->ki_pos);
} }
if (retval > 0) { if (retval > 0) {
*ppos = pos + retval; iocb->ki_pos += retval;
iov_iter_advance(iter, retval); iov_iter_advance(iter, retval);
} }
@ -1872,14 +1871,14 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
* the rest of the read. Buffered reads will not work for * the rest of the read. Buffered reads will not work for
* DAX files, so don't bother trying. * DAX files, so don't bother trying.
*/ */
if (retval < 0 || !iov_iter_count(iter) || *ppos >= size || if (retval < 0 || !iov_iter_count(iter) || iocb->ki_pos >= size ||
IS_DAX(inode)) { IS_DAX(inode)) {
file_accessed(file); file_accessed(file);
goto out; goto out;
} }
} }
retval = do_generic_file_read(file, ppos, iter, retval); retval = do_generic_file_read(file, &iocb->ki_pos, iter, retval);
out: out:
return retval; return retval;
} }