OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm/filemap: fix readahead return types 

A readahead request will not allocate more memory than can be represented
by a size_t, even on systems that have HIGHMEM available.  Change the
length functions from returning an loff_t to a size_t.

Link: https://lkml.kernel.org/r/20210510201201.1558972-1-willy@infradead.org
Fixes: 32c0a6bcaa ("btrfs: add and use readahead_batch_length")
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-05-14 17:27:30 -07:00 committed by Linus Torvalds
parent f649dc0e0d
commit 076171a677
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/iomap/buffered-io.c
View File

@ -394,7 +394,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)
{ {
struct inode *inode = rac->mapping->host; struct inode *inode = rac->mapping->host;
loff_t pos = readahead_pos(rac); loff_t pos = readahead_pos(rac);
loff_t length = readahead_length(rac); size_t length = readahead_length(rac);
struct iomap_readpage_ctx ctx = { struct iomap_readpage_ctx ctx = {
.rac = rac, .rac = rac,
}; };
@ -402,7 +402,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)
trace_iomap_readahead(inode, readahead_count(rac)); trace_iomap_readahead(inode, readahead_count(rac));
while (length > 0) { while (length > 0) {
loff_t ret = iomap_apply(inode, pos, length, 0, ops, ssize_t ret = iomap_apply(inode, pos, length, 0, ops,
&ctx, iomap_readahead_actor); &ctx, iomap_readahead_actor);
if (ret <= 0) { if (ret <= 0) {
WARN_ON_ONCE(ret == 0); WARN_ON_ONCE(ret == 0);

6
include/linux/pagemap.h
View File

@ -997,9 +997,9 @@ static inline loff_t readahead_pos(struct readahead_control *rac)
* readahead_length - The number of bytes in this readahead request. * readahead_length - The number of bytes in this readahead request.
* @rac: The readahead request. * @rac: The readahead request.
*/ */
static inline loff_t readahead_length(struct readahead_control *rac) static inline size_t readahead_length(struct readahead_control *rac)
{ {
return (loff_t)rac->_nr_pages * PAGE_SIZE; return rac->_nr_pages * PAGE_SIZE;
} }
/** /**
@ -1024,7 +1024,7 @@ static inline unsigned int readahead_count(struct readahead_control *rac)
* readahead_batch_length - The number of bytes in the current batch. * readahead_batch_length - The number of bytes in the current batch.
* @rac: The readahead request. * @rac: The readahead request.
*/ */
static inline loff_t readahead_batch_length(struct readahead_control *rac) static inline size_t readahead_batch_length(struct readahead_control *rac)
{ {
return rac->_batch_count * PAGE_SIZE; return rac->_batch_count * PAGE_SIZE;
} }