The patch titled
readahead: state based method: protect against tiny size
has been removed from the -mm tree. Its filename was
readahead-state-based-method-protect-against-tiny-size.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: readahead: state based method: protect against tiny size
From: Fengguang Wu <wfg@xxxxxxxxxxxxxxxx>
Move the tiny I/O size protection code from limit_rala() to
state_based_readahead().
limit_rala() is also called by context based readahead, which has its own
minimal readahead size.
Signed-off-by: Fengguang Wu <wfg@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/readahead.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff -puN mm/readahead.c~readahead-state-based-method-protect-against-tiny-size mm/readahead.c
--- a/mm/readahead.c~readahead-state-based-method-protect-against-tiny-size
+++ a/mm/readahead.c
@@ -1034,13 +1034,6 @@ static void limit_rala(unsigned long ra_
unsigned long stream_shift;
/*
- * Protect against too small I/O sizes,
- * by mapping [0, 4*min] to [min, 4*min].
- */
- if (*ra_size < 4 * MIN_RA_PAGES)
- *ra_size = MIN_RA_PAGES + *ra_size * 3 / 4;
-
- /*
* Apply basic upper limits.
*/
if (*ra_size > ra_max)
@@ -1148,6 +1141,13 @@ state_based_readahead(struct address_spa
if (!adjust_rala(&ra_size, &la_size))
goto cancel_lookahead;
+ /*
+ * Protect against too small I/O sizes,
+ * by mapping [0, 4*min] to [min, 4*min].
+ */
+ if (ra_size < 4 * MIN_RA_PAGES)
+ ra_size = MIN_RA_PAGES + ra_size * 3 / 4;
+
growth_limit = req_size;
growth_limit += ra_max / 16;
growth_limit += 2 * ra_old;
_
Patches currently in -mm which might be from wfg@xxxxxxxxxxxxxxxx are
origin.patch
readahead-state-based-method-protect-against-tiny-size.patch
readahead-rename-state_based_readahead-to-clock_based_readahead.patch
readahead-account-i-o-block-times-for-stock-readahead.patch
readahead-rescue_pages-updates.patch
readahead-remove-noaction-shrink-events.patch
readahead-remove-size-limit-on-read_ahead_kb.patch
readahead-remove-size-limit-of-max_sectors_kb-on-read_ahead_kb.patch
readahead-partial-sendfile-fix.patch
readahead-turn-on-by-default.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
