Merge "mm: change initial readahead window size calculation" into msm-4.9 (d0a3e94c) · Commits · e / devices / android_kernel_fairphone_FP3

mm/readahead.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -233,6 +233,8 @@ int force_page_cache_readahead(struct address_space mapping, struct file filp,

		/*
		* Set the initial window size, round to next power of 2 and square
		* Small size is not dependent on max value - only a one-page read is regarded
		* as small.
		* for small size, x 4 for medium, and x 2 for large
		* for 128k (32 page) max ra
		* 1-8 page = 32k initial, > 8 page = 128k initial
		@@ -241,7 +243,7 @@ static unsigned long get_init_ra_size(unsigned long size, unsigned long max)
		{
		unsigned long newsize = roundup_pow_of_two(size);

		if (newsize <= max / 32)
		if (newsize <= 1)
		newsize = newsize * 4;
		else if (newsize <= max / 4)
		newsize = newsize * 2;