From: Christoph Hellwig <hch@lst.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kent Overstreet <kent.overstreet@gmail.com>,
Matthew Wilcox <willy@infradead.org>,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 07/13] mm: refactor generic_file_buffered_read_get_pages
Date: Sat, 31 Oct 2020 09:59:58 +0100 [thread overview]
Message-ID: <20201031090004.452516-8-hch@lst.de> (raw)
In-Reply-To: <20201031090004.452516-1-hch@lst.de>
Move the call to filemap_make_page_uptodate for a newly allocated page
into filemap_new_page, which turns the new vs lookup decision into a
plain if / else statement, rename two identifier to be more obvious
and the function itself to filemap_read_pages which describes
it a little better while being much shorter.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
mm/filemap.c | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index 0af7ddaa0fe7ba..96855299247c56 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2320,7 +2320,10 @@ static int filemap_new_page(struct kiocb *iocb, struct iov_iter *iter,
return error;
}
- return filemap_readpage(iocb, *page);
+ error = filemap_readpage(iocb, *page);
+ if (error)
+ return error;
+ return filemap_make_page_uptodate(iocb, iter, *page, index, true);
}
static int filemap_find_get_pages(struct kiocb *iocb, struct iov_iter *iter,
@@ -2344,40 +2347,38 @@ static int filemap_find_get_pages(struct kiocb *iocb, struct iov_iter *iter,
return find_get_pages_contig(mapping, index, nr, pages);
}
-static int generic_file_buffered_read_get_pages(struct kiocb *iocb,
- struct iov_iter *iter,
- struct page **pages,
- unsigned int nr)
+static int filemap_read_pages(struct kiocb *iocb, struct iov_iter *iter,
+ struct page **pages, unsigned int nr)
{
pgoff_t index = iocb->ki_pos >> PAGE_SHIFT;
- int i, j, nr_got, err = 0;
+ int nr_pages, err = 0, i, j;
-find_page:
+retry:
if (fatal_signal_pending(current))
return -EINTR;
- nr_got = filemap_find_get_pages(iocb, iter, pages, nr);
- if (!nr_got) {
+ nr_pages = filemap_find_get_pages(iocb, iter, pages, nr);
+ if (nr_pages) {
+ for (i = 0; i < nr_pages; i++) {
+ err = filemap_make_page_uptodate(iocb, iter, pages[i],
+ index + i, i == 0);
+ if (err) {
+ for (j = i + 1; j < nr_pages; j++)
+ put_page(pages[j]);
+ nr_pages = i;
+ break;
+ }
+ }
+ } else {
err = filemap_new_page(iocb, iter, &pages[0]);
if (!err)
- nr_got = 1;
+ nr_pages = 1;
}
- for (i = 0; i < nr_got; i++) {
- err = filemap_make_page_uptodate(iocb, iter, pages[i],
- index + i, i == 0);
- if (err) {
- for (j = i + 1; j < nr_got; j++)
- put_page(pages[j]);
- nr_got = i;
- break;
- }
- }
-
- if (likely(nr_got))
- return nr_got;
+ if (likely(nr_pages))
+ return nr_pages;
if (err == -EEXIST || err == AOP_TRUNCATED_PAGE)
- goto find_page;
+ goto retry;
return err;
}
@@ -2436,8 +2437,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_read_pages(iocb, iter, pages, nr_pages);
if (pg_nr < 0) {
error = pg_nr;
break;
--
2.28.0
next prev parent reply other threads:[~2020-10-31 9:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-31 8:59 clean up the generic pagecache read helpers Christoph Hellwig
2020-10-31 8:59 ` [PATCH 01/13] mm: simplify generic_file_buffered_read_readpage Christoph Hellwig
2020-10-31 8:59 ` [PATCH 02/13] mm: simplify generic_file_buffered_read_pagenotuptodate Christoph Hellwig
2020-10-31 8:59 ` [PATCH 03/13] mm: lift the nowait checks into generic_file_buffered_read_pagenotuptodate Christoph Hellwig
2020-10-31 8:59 ` [PATCH 04/13] mm: handle readahead in generic_file_buffered_read_pagenotuptodate Christoph Hellwig
2020-10-31 17:06 ` Matthew Wilcox
2020-11-01 10:31 ` Christoph Hellwig
2020-11-01 10:49 ` Matthew Wilcox
2020-11-01 10:51 ` Christoph Hellwig
2020-11-01 10:51 ` Christoph Hellwig
2020-11-01 11:04 ` Matthew Wilcox
2020-11-01 11:52 ` Christoph Hellwig
2020-11-01 14:55 ` Matthew Wilcox
2020-11-02 8:18 ` Christoph Hellwig
2020-10-31 8:59 ` [PATCH 05/13] mm: simplify generic_file_buffered_read_no_cached_page Christoph Hellwig
2020-10-31 16:20 ` Matthew Wilcox
2020-10-31 16:28 ` Matthew Wilcox
2020-11-01 10:29 ` Christoph Hellwig
2020-10-31 8:59 ` [PATCH 06/13] mm: factor out a filemap_find_get_pages helper Christoph Hellwig
2020-10-31 8:59 ` Christoph Hellwig [this message]
2020-11-01 11:18 ` [PATCH 07/13] mm: refactor generic_file_buffered_read_get_pages Matthew Wilcox
2020-10-31 8:59 ` [PATCH 08/13] mm: move putting the page on error out of filemap_readpage Christoph Hellwig
2020-10-31 9:00 ` [PATCH 09/13] mm: move putting the page on error out of filemap_make_page_uptodate Christoph Hellwig
2020-10-31 9:00 ` [PATCH 10/13] mm: open code readahead in filemap_new_page Christoph Hellwig
2020-11-01 11:20 ` Matthew Wilcox
2020-10-31 9:00 ` [PATCH 11/13] mm: streamline the partially uptodate checks in filemap_make_page_uptodate Christoph Hellwig
2020-11-01 11:23 ` Matthew Wilcox
2020-10-31 9:00 ` [PATCH 12/13] mm: rename generic_file_buffered_read to filemap_read Christoph Hellwig
2020-10-31 9:00 ` [PATCH 13/13] mm: simplify generic_file_read_iter Christoph Hellwig
2020-10-31 15:42 ` clean up the generic pagecache read helpers Matthew Wilcox
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=20201031090004.452516-8-hch@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--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).