On Tue 22-08-17 18:17:09, Christoph Hellwig wrote:
> And rename it to the more descriptive generic_file_buffered_read while
> at it.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> mm/filemap.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/mm/filemap.c b/mm/filemap.c
> index a49702445ce0..4bcfa74ad802 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -1886,9 +1886,8 @@ static void shrink_readahead_size_eio(struct file *filp,
> }
>
> /**
> - * do_generic_file_read - generic file read routine
> - * @filp: the file to read
> - * @ppos: current file position
> + * generic_file_buffered_read - generic file read routine
> + * @iocb: the iocb to read
> * @iter: data destination
> * @written: already copied
> *
> @@ -1898,12 +1897,14 @@ static void shrink_readahead_size_eio(struct file *filp,
> * This is really ugly. But the goto's actually try to clarify some
> * of the logic when it comes to error handling etc.
> */
> -static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
> +static ssize_t generic_file_buffered_read(struct kiocb *iocb,
> struct iov_iter *iter, ssize_t written)
> {
> + struct file *filp = iocb->ki_filp;
> struct address_space *mapping = filp->f_mapping;
> struct inode *inode = mapping->host;
> struct file_ra_state *ra = &filp->f_ra;
> + loff_t *ppos = &iocb->ki_pos;
> pgoff_t index;
> pgoff_t last_index;
> pgoff_t prev_index;
> @@ -2151,14 +2152,14 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
> ssize_t
> generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
> {
> - struct file *file = iocb->ki_filp;
> - ssize_t retval = 0;
> size_t count = iov_iter_count(iter);
> + ssize_t retval = 0;
>
> if (!count)
> goto out; /* skip atime */
>
> if (iocb->ki_flags & IOCB_DIRECT) {
> + struct file *file = iocb->ki_filp;
> struct address_space *mapping = file->f_mapping;
> struct inode *inode = mapping->host;
> loff_t size;
> @@ -2199,7 +2200,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
> goto out;
> }
>
> - retval = do_generic_file_read(file, &iocb->ki_pos, iter, retval);
> + retval = generic_file_buffered_read(iocb, iter, retval);
> out:
> return retval;
> }
> --
> 2.11.0
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
