Commit 20ff1c95 authored Dec 28, 2018 by Gao Xiang Committed by Linus Torvalds Dec 28, 2018

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>

parent 368686a9

mm/readahead.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -273,14 +273,12 @@ static unsigned long get_next_ra_size(struct file_ra_state *ra,
		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;
		}

		/*