Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c64fb5c7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

filemap: remove pos variables in generic_file_read_iter



Just use ki_pos directly to make everyones life easier.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bf162006
Loading
Loading
Loading
Loading
+7 −8
Original line number Diff line number Diff line
@@ -1838,8 +1838,6 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
{
	struct file *file = iocb->ki_filp;
	ssize_t retval = 0;
	loff_t *ppos = &iocb->ki_pos;
	loff_t pos = *ppos;
	size_t count = iov_iter_count(iter);

	if (!count)
@@ -1851,15 +1849,16 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
		loff_t size;

		size = i_size_read(inode);
		retval = filemap_write_and_wait_range(mapping, pos,
					pos + count - 1);
		retval = filemap_write_and_wait_range(mapping, iocb->ki_pos,
					iocb->ki_pos + count - 1);
		if (!retval) {
			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) {
			*ppos = pos + retval;
			iocb->ki_pos += 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
		 * 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)) {
			file_accessed(file);
			goto out;
		}
	}

	retval = do_generic_file_read(file, ppos, iter, retval);
	retval = do_generic_file_read(file, &iocb->ki_pos, iter, retval);
out:
	return retval;
}