From: Wu Fengguang <fengguang.wu@intel.com>
Date: Tue, 16 Jun 2009 22:31:21 +0000 (-0700)
Subject: readahead: apply max_sane_readahead() limit in ondemand_readahead()
X-Git-Tag: firefly_0821_release~13889^2~175
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fc31d16add13773265cc53d59f2e7594cb3c0a14;p=firefly-linux-kernel-4.4.55.git

readahead: apply max_sane_readahead() limit in ondemand_readahead()

Just in case someone aggressively sets a huge readahead size.

Cc: Nick Piggin <npiggin@suse.de>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Ying Han <yinghan@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/readahead.c b/mm/readahead.c
index a224182a3a63..bd0f0e88b0a1 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -357,7 +357,7 @@ ondemand_readahead(struct address_space *mapping,
 		   bool hit_readahead_marker, pgoff_t offset,
 		   unsigned long req_size)
 {
-	int	max = ra->ra_pages;	/* max readahead pages */
+	unsigned long max = max_sane_readahead(ra->ra_pages);
 	pgoff_t prev_offset;
 	int	sequential;