From: Matthew Wilcox <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 01/12] mm: Fix the return type of __do_page_cache_readahead
Date: Sat, 1 Feb 2020 07:12:29 -0800 [thread overview]
Message-ID: <20200201151240.24082-2-willy@infradead.org> (raw)
In-Reply-To: <20200201151240.24082-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
ra_submit() which is a wrapper around __do_page_cache_readahead() already
returns an unsigned long, and the 'nr_to_read' parameter is an unsigned
long, so fix __do_page_cache_readahead() to return an unsigned long,
even though I'm pretty sure we're not going to readahead more than 2^32
pages ever.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/internal.h | 2 +-
mm/readahead.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/internal.h b/mm/internal.h
index 3cf20ab3ca01..41b93c4b3ab7 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -49,7 +49,7 @@ void unmap_page_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
struct zap_details *details);
-extern unsigned int __do_page_cache_readahead(struct address_space *mapping,
+extern unsigned long __do_page_cache_readahead(struct address_space *mapping,
struct file *filp, pgoff_t offset, unsigned long nr_to_read,
unsigned long lookahead_size);
diff --git a/mm/readahead.c b/mm/readahead.c
index 2fe72cd29b47..6bf73ef33b7e 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -152,7 +152,7 @@ static int read_pages(struct address_space *mapping, struct file *filp,
*
* Returns the number of pages requested, or the maximum amount of I/O allowed.
*/
-unsigned int __do_page_cache_readahead(struct address_space *mapping,
+unsigned long __do_page_cache_readahead(struct address_space *mapping,
struct file *filp, pgoff_t offset, unsigned long nr_to_read,
unsigned long lookahead_size)
{
@@ -161,7 +161,7 @@ unsigned int __do_page_cache_readahead(struct address_space *mapping,
unsigned long end_index; /* The last page we want to read */
LIST_HEAD(page_pool);
int page_idx;
- unsigned int nr_pages = 0;
+ unsigned long nr_pages = 0;
loff_t isize = i_size_read(inode);
gfp_t gfp_mask = readahead_gfp_mask(mapping);
--
2.24.1
next prev parent reply other threads:[~2020-02-01 15:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-01 15:12 [PATCH v4 00/12] Change readahead API Matthew Wilcox
2020-02-01 15:12 ` Matthew Wilcox [this message]
2020-02-01 15:12 ` [PATCH v4 02/12] readahead: Ignore return value of ->readpages Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 03/12] readahead: Put pages in cache earlier Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 04/12] mm: Add readahead address space operation Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 05/12] fs: Convert mpage_readpages to mpage_readahead Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 06/12] btrfs: Convert from readpages to readahead Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 07/12] erofs: Convert uncompressed files " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 08/12] erofs: Convert compressed " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 09/12] ext4: Convert " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 10/12] f2fs: " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 11/12] fuse: " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 12/12] iomap: " Matthew Wilcox
2020-02-04 15:32 ` [PATCH v4 00/12] Change readahead API David Sterba
2020-02-04 17:16 ` 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=20200201151240.24082-2-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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).