From: David Sterba <dsterba@suse.cz>
To: Goldwyn Rodrigues <rgoldwyn@suse.de>
Cc: linux-btrfs@vger.kernel.org, hch@infradead.org, dsterba@suse.cz,
Goldwyn Rodrigues <rgoldwyn@suse.com>,
Johannes Thumshirn <jthumshirn@suse.de>,
Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCH 1/7] fs: Export generic_file_buffered_read()
Date: Mon, 25 May 2020 14:25:19 +0200 [thread overview]
Message-ID: <20200525122519.GQ18421@twin.jikos.cz> (raw)
In-Reply-To: <20200522123837.1196-2-rgoldwyn@suse.de>
On Fri, May 22, 2020 at 07:38:31AM -0500, Goldwyn Rodrigues wrote:
> From: Goldwyn Rodrigues <rgoldwyn@suse.com>
>
> Export generic_file_buffered_read() to be used to
> supplement incomplete direct reads.
>
> While we are at it, correct the comments and variable names.
>
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
> include/linux/fs.h | 2 ++
> mm/filemap.c | 13 +++++++------
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 45cc10cdf6dd..366c533d30cd 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -3124,6 +3124,8 @@ extern int generic_file_rw_checks(struct file *file_in, struct file *file_out);
> extern int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
> struct file *file_out, loff_t pos_out,
> size_t *count, unsigned int flags);
> +extern ssize_t generic_file_buffered_read(struct kiocb *iocb,
> + struct iov_iter *to, ssize_t already_read);
> extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
> extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
> extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 23a051a7ef0f..27df1cf35eb4 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -1979,7 +1979,7 @@ static void shrink_readahead_size_eio(struct file_ra_state *ra)
> * generic_file_buffered_read - generic file read routine
> * @iocb: the iocb to read
> * @iter: data destination
> - * @written: already copied
> + * @copied: already copied
> *
> * This is a generic file read routine, and uses the
> * mapping->a_ops->readpage() function for the actual low-level stuff.
> @@ -1988,11 +1988,11 @@ static void shrink_readahead_size_eio(struct file_ra_state *ra)
> * of the logic when it comes to error handling etc.
> *
> * Return:
> - * * total number of bytes copied, including those the were already @written
> + * * total number of bytes copied, including those that were @copied
> * * negative error code if nothing was copied
> */
> -static ssize_t generic_file_buffered_read(struct kiocb *iocb,
> - struct iov_iter *iter, ssize_t written)
> +ssize_t generic_file_buffered_read(struct kiocb *iocb,
> + struct iov_iter *iter, ssize_t copied)
> {
> struct file *filp = iocb->ki_filp;
> struct address_space *mapping = filp->f_mapping;
> @@ -2133,7 +2133,7 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
> prev_offset = offset;
>
> put_page(page);
> - written += ret;
> + copied += ret;
> if (!iov_iter_count(iter))
> goto out;
> if (ret < nr) {
> @@ -2241,8 +2241,9 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
>
> *ppos = ((loff_t)index << PAGE_SHIFT) + offset;
> file_accessed(filp);
> - return written ? written : error;
> + return copied ? copied : error;
> }
> +EXPORT_SYMBOL_GPL(generic_file_buffered_read);
The renamed variable causes build issues with block tree so I've
s/copied/written/ back as we want only the function export.
next prev parent reply other threads:[~2020-05-25 12:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 12:38 [PATCH 0/7 v8] btrfs direct-io using iomap Goldwyn Rodrigues
2020-05-22 12:38 ` [PATCH 1/7] fs: Export generic_file_buffered_read() Goldwyn Rodrigues
2020-05-25 12:25 ` David Sterba [this message]
2020-05-22 12:38 ` [PATCH 2/7] iomap: add a filesystem hook for direct I/O bio submission Goldwyn Rodrigues
2020-05-22 12:38 ` [PATCH 3/7] iomap: Remove lockdep_assert_held() Goldwyn Rodrigues
2020-05-28 15:40 ` Darrick J. Wong
2020-05-28 16:45 ` Goldwyn Rodrigues
2020-05-22 12:38 ` [PATCH 4/7] btrfs: Switch to iomap_dio_rw() for dio Goldwyn Rodrigues
2020-05-26 15:03 ` Johannes Thumshirn
2020-05-26 16:44 ` Goldwyn Rodrigues
2020-05-28 15:13 ` Filipe Manana
2020-05-28 16:34 ` Goldwyn Rodrigues
2020-05-28 16:45 ` Filipe Manana
2020-05-28 18:38 ` Goldwyn Rodrigues
2020-06-03 11:35 ` Filipe Manana
2020-06-05 15:17 ` Filipe Manana
2020-06-05 20:43 ` Goldwyn Rodrigues
2020-06-06 9:57 ` Filipe Manana
2020-06-08 15:39 ` Goldwyn Rodrigues
2020-05-22 12:38 ` [PATCH 5/7] fs: Remove dio_end_io() Goldwyn Rodrigues
2020-05-22 12:38 ` [PATCH 6/7] btrfs: remove BTRFS_INODE_READDIO_NEED_LOCK Goldwyn Rodrigues
2020-05-22 12:38 ` [PATCH 7/7] btrfs: btrfs: split btrfs_direct_IO Goldwyn Rodrigues
-- strict thread matches above, loose matches on Subject: below --
2019-11-15 16:16 btrfs direct-io using iomap Goldwyn Rodrigues
2019-11-15 16:16 ` [PATCH 1/7] fs: Export generic_file_buffered_read() Goldwyn Rodrigues
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200525122519.GQ18421@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=jthumshirn@suse.de \
--cc=linux-btrfs@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=rgoldwyn@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).