The patch titled
readahead: state based method: cancel lookahead gracefully
has been added to the -mm tree. Its filename is
readahead-state-based-method-cancel-lookahead-gracefully.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: readahead: state based method: cancel lookahead gracefully
From: Fengguang Wu <wfg@xxxxxxxxxxxxxxxx>
When canceling lookahead, update ra->lookahead_index to the next invoke index.
So that we see a consistent state in the next time.
Signed-off-by: Fengguang Wu <wfg@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/readahead.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -puN mm/readahead.c~readahead-state-based-method-cancel-lookahead-gracefully mm/readahead.c
--- a/mm/readahead.c~readahead-state-based-method-cancel-lookahead-gracefully
+++ a/mm/readahead.c
@@ -1094,7 +1094,7 @@ state_based_readahead(struct address_spa
if (page && remain_space <= la_size) {
rescue_pages(page, la_size);
- return 0;
+ goto cancel_lookahead;
}
growth_limit = req_size;
@@ -1104,7 +1104,7 @@ state_based_readahead(struct address_spa
growth_limit = ra_max;
if (!adjust_rala(growth_limit, &ra_size, &la_size))
- return 0;
+ goto cancel_lookahead;
limit_rala(growth_limit, la_old, &ra_size, &la_size);
@@ -1113,6 +1113,10 @@ state_based_readahead(struct address_spa
ra_set_size(ra, ra_size, la_size);
return ra_submit(ra, mapping, filp);
+
+cancel_lookahead:
+ ra->lookahead_index = ra->readahead_index;
+ return 0;
}
#endif /* CONFIG_ADAPTIVE_READAHEAD */
_
Patches currently in -mm which might be from wfg@xxxxxxxxxxxxxxxx are
readahead-kconfig-options.patch
radixtree-introduce-scan-hole-data-functions.patch
mm-introduce-probe_page.patch
mm-introduce-pg_readahead.patch
readahead-add-look-ahead-support-to-__do_page_cache_readahead.patch
readahead-insert-cond_resched-calls.patch
readahead-minmax_ra_pages.patch
readahead-events-accounting.patch
readahead-rescue_pages.patch
readahead-sysctl-parameters.patch
readahead-min-max-sizes.patch
readahead-state-based-method-aging-accounting.patch
readahead-state-based-method-routines.patch
readahead-state-based-method.patch
readahead-state-based-method-check-node-id.patch
readahead-state-based-method-decouple-readahead_ratio-from-growth_limit.patch
readahead-state-based-method-cancel-lookahead-gracefully.patch
readahead-context-based-method.patch
readahead-initial-method-guiding-sizes.patch
readahead-initial-method-thrashing-guard-size.patch
readahead-initial-method-user-recommended-size.patch
readahead-initial-method.patch
readahead-backward-prefetching-method.patch
readahead-thrashing-recovery-method.patch
readahead-thrashing-recovery-method-check-unbalanced-aging.patch
readahead-thrashing-recovery-method-refill-holes.patch
readahead-call-scheme.patch
readahead-call-scheme-cleanup.patch
readahead-call-scheme-catch-thrashing-on-lookahead-time.patch
readahead-laptop-mode.patch
readahead-loop-case.patch
readahead-nfsd-case.patch
readahead-remove-parameter-ra_max-from-thrashing_recovery_readahead.patch
readahead-remove-parameter-ra_max-from-adjust_rala.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
