From: Miaohe Lin <linmiaohe@huawei.com>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
<linux-fsdevel@vger.kernel.org>, <linux-mm@kvack.org>
Cc: <hch@lst.de>, <kent.overstreet@gmail.com>
Subject: Re: [PATCH v4 01/18] mm/filemap: Rename generic_file_buffered_read subfunctions
Date: Thu, 21 Jan 2021 16:23:47 +0800 [thread overview]
Message-ID: <293e33c4-c112-8fa9-0935-34cd826428f7@huawei.com> (raw)
In-Reply-To: <20210121041616.3955703-2-willy@infradead.org>
Hi:
On 2021/1/21 12:15, Matthew Wilcox (Oracle) wrote:
> The recent split of generic_file_buffered_read() created some very
> long function names which are hard to distinguish from each other.
> Rename as follows:
>
> generic_file_buffered_read_readpage -> filemap_read_page
> generic_file_buffered_read_pagenotuptodate -> filemap_update_page
> generic_file_buffered_read_no_cached_page -> filemap_create_page
> generic_file_buffered_read_get_pages -> filemap_get_pages
> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Reviewed-by: Kent Overstreet <kent.overstreet@gmail.com>
> ---
> mm/filemap.c | 44 +++++++++++++++-----------------------------
> 1 file changed, 15 insertions(+), 29 deletions(-)
>
> diff --git a/mm/filemap.c b/mm/filemap.c
> index d90614f501daa..934e04f1760ef 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -2168,11 +2168,8 @@ static int lock_page_for_iocb(struct kiocb *iocb, struct page *page)
> return lock_page_killable(page);
> }
>
> -static struct page *
> -generic_file_buffered_read_readpage(struct kiocb *iocb,
> - struct file *filp,
> - struct address_space *mapping,
> - struct page *page)
> +static struct page *filemap_read_page(struct kiocb *iocb, struct file *filp,
> + struct address_space *mapping, struct page *page)
> {
> struct file_ra_state *ra = &filp->f_ra;
> int error;
> @@ -2223,12 +2220,9 @@ generic_file_buffered_read_readpage(struct kiocb *iocb,
> return page;
> }
>
> -static struct page *
> -generic_file_buffered_read_pagenotuptodate(struct kiocb *iocb,
> - struct file *filp,
> - struct iov_iter *iter,
> - struct page *page,
> - loff_t pos, loff_t count)
> +static struct page *filemap_update_page(struct kiocb *iocb, struct file *filp,
> + struct iov_iter *iter, struct page *page, loff_t pos,
> + loff_t count)
> {
> struct address_space *mapping = filp->f_mapping;
> struct inode *inode = mapping->host;
> @@ -2291,12 +2285,11 @@ generic_file_buffered_read_pagenotuptodate(struct kiocb *iocb,
> return page;
> }
>
> - return generic_file_buffered_read_readpage(iocb, filp, mapping, page);
> + return filemap_read_page(iocb, filp, mapping, page);
> }
>
> -static struct page *
> -generic_file_buffered_read_no_cached_page(struct kiocb *iocb,
> - struct iov_iter *iter)
> +static struct page *filemap_create_page(struct kiocb *iocb,
> + struct iov_iter *iter)
> {
> struct file *filp = iocb->ki_filp;
> struct address_space *mapping = filp->f_mapping;
> @@ -2307,10 +2300,6 @@ generic_file_buffered_read_no_cached_page(struct kiocb *iocb,
> if (iocb->ki_flags & IOCB_NOIO)
> return ERR_PTR(-EAGAIN);
>
> - /*
> - * Ok, it wasn't cached, so we need to create a new
> - * page..
> - */
> page = page_cache_alloc(mapping);
> if (!page)
> return ERR_PTR(-ENOMEM);
> @@ -2322,13 +2311,11 @@ generic_file_buffered_read_no_cached_page(struct kiocb *iocb,
> return error != -EEXIST ? ERR_PTR(error) : NULL;
> }
>
> - return generic_file_buffered_read_readpage(iocb, filp, mapping, page);
> + return filemap_read_page(iocb, filp, mapping, page);
> }
>
> -static int generic_file_buffered_read_get_pages(struct kiocb *iocb,
> - struct iov_iter *iter,
> - struct page **pages,
> - unsigned int nr)
> +static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter,
> + struct page **pages, unsigned int nr)
> {
> struct file *filp = iocb->ki_filp;
> struct address_space *mapping = filp->f_mapping;
> @@ -2355,7 +2342,7 @@ static int generic_file_buffered_read_get_pages(struct kiocb *iocb,
> if (nr_got)
> goto got_pages;
>
> - pages[0] = generic_file_buffered_read_no_cached_page(iocb, iter);
> + pages[0] = filemap_create_page(iocb, iter);
> err = PTR_ERR_OR_ZERO(pages[0]);
> if (!IS_ERR_OR_NULL(pages[0]))
> nr_got = 1;
> @@ -2389,8 +2376,8 @@ static int generic_file_buffered_read_get_pages(struct kiocb *iocb,
> break;
> }
>
> - page = generic_file_buffered_read_pagenotuptodate(iocb,
> - filp, iter, page, pg_pos, pg_count);
> + page = filemap_update_page(iocb, filp, iter, page,
> + pg_pos, pg_count);
> if (IS_ERR_OR_NULL(page)) {
> for (j = i + 1; j < nr_got; j++)
> put_page(pages[j]);
> @@ -2466,8 +2453,7 @@ ssize_t generic_file_buffered_read(struct kiocb *iocb,
> iocb->ki_flags |= IOCB_NOWAIT;
>
> i = 0;
> - pg_nr = generic_file_buffered_read_get_pages(iocb, iter,
> - pages, nr_pages);
> + pg_nr = filemap_get_pages(iocb, iter, pages, nr_pages);
> if (pg_nr < 0) {
> error = pg_nr;
> break;
>
Looks good to me. Thanks.
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
next prev parent reply other threads:[~2021-01-21 8:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 4:15 [PATCH v4 00/18] Refactor generic_file_buffered_read Matthew Wilcox (Oracle)
2021-01-21 4:15 ` [PATCH v4 01/18] mm/filemap: Rename generic_file_buffered_read subfunctions Matthew Wilcox (Oracle)
2021-01-21 7:30 ` Christoph Hellwig
2021-01-21 8:23 ` Miaohe Lin [this message]
2021-01-21 4:16 ` [PATCH v4 02/18] mm/filemap: Remove dynamically allocated array from filemap_read Matthew Wilcox (Oracle)
2021-01-21 7:31 ` Christoph Hellwig
2021-01-22 6:59 ` Miaohe Lin
2021-01-21 4:16 ` [PATCH v4 03/18] mm/filemap: Convert filemap_get_pages to take a pagevec Matthew Wilcox (Oracle)
2021-01-21 7:31 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 04/18] mm/filemap: Use head pages in generic_file_buffered_read Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 05/18] mm/filemap: Pass a sleep state to put_and_wait_on_page_locked Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 06/18] mm/filemap: Support readpage splitting a page Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 07/18] mm/filemap: Inline __wait_on_page_locked_async into caller Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 08/18] mm/filemap: Don't call ->readpage if IOCB_WAITQ is set Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 09/18] mm/filemap: Change filemap_read_page calling conventions Matthew Wilcox (Oracle)
2021-01-21 7:31 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 10/18] mm/filemap: Change filemap_create_page " Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 11/18] mm/filemap: Convert filemap_update_page to return an errno Matthew Wilcox (Oracle)
2021-01-21 7:32 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 12/18] mm/filemap: Move the iocb checks into filemap_update_page Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 13/18] mm/filemap: Add filemap_range_uptodate Matthew Wilcox (Oracle)
2021-01-21 7:32 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 14/18] mm/filemap: Split filemap_readahead out of filemap_get_pages Matthew Wilcox (Oracle)
2021-01-21 7:33 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 15/18] mm/filemap: Restructure filemap_get_pages Matthew Wilcox (Oracle)
2021-01-21 7:33 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 16/18] mm/filemap: Don't relock the page after calling readpage Matthew Wilcox (Oracle)
2021-01-21 7:34 ` Christoph Hellwig
2021-01-21 4:16 ` [PATCH v4 17/18] mm/filemap: Rename generic_file_buffered_read to filemap_read Matthew Wilcox (Oracle)
2021-01-21 4:16 ` [PATCH v4 18/18] mm/filemap: Simplify generic_file_read_iter Matthew Wilcox (Oracle)
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=293e33c4-c112-8fa9-0935-34cd826428f7@huawei.com \
--to=linmiaohe@huawei.com \
--cc=hch@lst.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.org \
/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).