diff options
| author |   Gao Xiang <hsiangkao@aol.com> | 2018-12-28 00:33:34 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-28 12:11:46 -0800 |
| commit | 20ff1c950500380c6f74ec1a0d6f4eafab673ef6 (patch) | |
| tree | 917edac99a1ab31b2f643c796330315981f30480 /mm/readahead.c | |
| parent | writeback: don't decrement wb->refcnt if !wb->bdi (diff) | |
| download | wireguard-linux-20ff1c950500380c6f74ec1a0d6f4eafab673ef6.tar.xz wireguard-linux-20ff1c950500380c6f74ec1a0d6f4eafab673ef6.zip | |
mm/readahead.c: simplify get_next_ra_size()
It's a trivial simplification for get_next_ra_size() and clear enough for
humans to understand.
It also fixes potential overflow if ra->size(< ra_pages) is too large.
Link: http://lkml.kernel.org/r/1540707206-19649-1-git-send-email-hsiangkao@aol.com
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
Reviewed-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/readahead.c')
| -rw-r--r-- | mm/readahead.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mm/readahead.c b/mm/readahead.c index f3d6f9656a3c..1ae16522412a 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -270,17 +270,15 @@ static unsigned long get_init_ra_size(unsigned long size, unsigned long max) * return it as the new window size. */ static unsigned long get_next_ra_size(struct file_ra_state *ra, - unsigned long max) + unsigned long max) { unsigned long cur = ra->size; - unsigned long newsize; if (cur < max / 16) - newsize = 4 * cur; - else - newsize = 2 * cur; - - return min(newsize, max); + return 4 * cur; + if (cur <= max / 2) + return 2 * cur; + return max; } /* |