From: David Howells <dhowells@redhat.com>
To: willy@infradead.org
Cc: dhowells@redhat.com, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 5/6] mm: Fold ra_submit() into do_sync_mmap_readahead() [ver #2]
Date: Wed, 02 Sep 2020 16:44:53 +0100 [thread overview]
Message-ID: <159906149326.663183.12774034343203621496.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <159906145700.663183.3678164182141075453.stgit@warthog.procyon.org.uk>
Fold ra_submit() into its last remaining user and pass the previously added
readahead_control struct down into __do_page_cache_readahead().
Signed-off-by: David Howells <dhowells@redhat.com>
---
mm/filemap.c | 6 +++---
mm/internal.h | 10 ----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index fdfeedd1eb71..eaa046fdc0b6 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2500,10 +2500,10 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf)
* mmap read-around
*/
fpin = maybe_unlock_mmap_for_io(vmf, fpin);
- ra->start = max_t(long, 0, offset - ra->ra_pages / 2);
- ra->size = ra->ra_pages;
+ ra->start = rac._index = max_t(long, 0, offset - ra->ra_pages / 2);
+ ra->size = ra->ra_pages;
ra->async_size = ra->ra_pages / 4;
- ra_submit(ra, mapping, file);
+ __do_page_cache_readahead(&rac, ra->size, ra->async_size);
return fpin;
}
diff --git a/mm/internal.h b/mm/internal.h
index c8ccf208f524..d62df5559500 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -53,16 +53,6 @@ void force_page_cache_readahead(struct readahead_control *, unsigned long);
void __do_page_cache_readahead(struct readahead_control *,
unsigned long nr_to_read, unsigned long lookahead_size);
-/*
- * Submit IO for the read-ahead request in file_ra_state.
- */
-static inline void ra_submit(struct file_ra_state *ra,
- struct address_space *mapping, struct file *file)
-{
- DEFINE_READAHEAD(rac, file, mapping, ra->start);
- __do_page_cache_readahead(&rac, ra->size, ra->async_size);
-}
-
/**
* page_evictable - test whether a page is evictable
* @page: the page to test
next prev parent reply other threads:[~2020-09-02 15:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 15:44 [RFC PATCH 0/6] mm: Make more use of readahead_control [ver #2] David Howells
2020-09-02 15:44 ` [RFC PATCH 1/6] Fix khugepaged's request size in collapse_file() " David Howells
2020-09-02 15:44 ` [RFC PATCH 2/6] mm: Make ondemand_readahead() take a readahead_control struct " David Howells
2020-09-02 15:44 ` [RFC PATCH 3/6] mm: Push readahead_control down into force_page_cache_readahead() " David Howells
2020-09-02 15:54 ` Matthew Wilcox
2020-09-02 15:44 ` [RFC PATCH 4/6] mm: Pass readahead_control into page_cache_{sync,async}_readahead() " David Howells
2020-09-02 15:44 ` David Howells [this message]
2020-09-02 15:45 ` [RFC PATCH 6/6] mm: Pass a file_ra_state struct into force_page_cache_readahead() " David Howells
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=159906149326.663183.12774034343203621496.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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).