The patch titled
readahead: remove size limit on read_ahead_kb
has been added to the -mm tree. Its filename is
readahead-remove-size-limit-on-read_ahead_kb.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: readahead: remove size limit on read_ahead_kb
From: Wu Fengguang <wfg@xxxxxxxxxxxxxxxx>
Remove the unnecessary size limit on setting read_ahead_kb.
Also make possible large values harmless. The stock readahead is protected by
always consulting the avaiable memory before applying this number. Other
readahead paths have already did so.
read_ahead_kb used to be guarded by the queue's max_sectors, which can be too
rigid because some devices set max_sectors to small values like 64kb. That
leads to many user complains.
Signed-off-by: Wu Fengguang <wfg@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
block/ll_rw_blk.c | 5 -----
mm/readahead.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff -puN block/ll_rw_blk.c~readahead-remove-size-limit-on-read_ahead_kb block/ll_rw_blk.c
--- devel/block/ll_rw_blk.c~readahead-remove-size-limit-on-read_ahead_kb 2006-06-09 01:22:58.000000000 -0700
+++ devel-akpm/block/ll_rw_blk.c 2006-06-09 01:22:58.000000000 -0700
@@ -3754,12 +3754,7 @@ queue_ra_store(struct request_queue *q,
unsigned long ra_kb;
ssize_t ret = queue_var_store(&ra_kb, page, count);
- spin_lock_irq(q->queue_lock);
- if (ra_kb > (q->max_sectors >> 1))
- ra_kb = (q->max_sectors >> 1);
-
q->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10);
- spin_unlock_irq(q->queue_lock);
return ret;
}
diff -puN mm/readahead.c~readahead-remove-size-limit-on-read_ahead_kb mm/readahead.c
--- devel/mm/readahead.c~readahead-remove-size-limit-on-read_ahead_kb 2006-06-09 01:22:58.000000000 -0700
+++ devel-akpm/mm/readahead.c 2006-06-09 01:22:58.000000000 -0700
@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(file_ra_state_init);
*/
static inline unsigned long get_max_readahead(struct file_ra_state *ra)
{
- return ra->ra_pages;
+ return max_sane_readahead(ra->ra_pages);
}
static inline unsigned long get_min_readahead(struct file_ra_state *ra)
_
Patches currently in -mm which might be from wfg@xxxxxxxxxxxxxxxx are
radixtree-normalize-radix_tree_tag_get-return-value.patch
readahead-kconfig-options.patch
radixtree-introduce-radix_tree_scan_hole.patch
mm-introduce-probe_page.patch
mm-introduce-pg_readahead.patch
readahead-add-look-ahead-support-to-__do_page_cache_readahead.patch
readahead-delay-page-release-in-do_generic_mapping_read.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-sysctl-parameters-fix.patch
readahead-min-max-sizes.patch
readahead-state-based-method-aging-accounting.patch
readahead-state-based-method-routines.patch
readahead-state-based-method-routines-no-ra_flag_eof-on-single-page-file.patch
readahead-state-based-method.patch
readahead-state-based-method-readahead-state-based-method-stand-alone-size-limit-code.patch
readahead-context-based-method.patch
readahead-context-based-method-apply-stream_shift-size-limits-to-contexta-method.patch
readahead-context-based-method-fix-remain-counting.patch
readahead-initial-method-guiding-sizes.patch
readahead-initial-method-guiding-sizes-aggressive-initial-sizes.patch
readahead-initial-method-thrashing-guard-size.patch
readahead-initial-method-expected-read-size.patch
readahead-initial-method-user-recommended-size.patch
readahead-initial-method.patch
readahead-backward-prefetching-method.patch
readahead-backward-prefetching-method-add-use-case-comment.patch
readahead-seeking-reads-method.patch
readahead-thrashing-recovery-method.patch
readahead-call-scheme.patch
readahead-call-scheme-fix-fastcall.patch
readahead-call-scheme-no-fastcall-for-readahead_cache_hit.patch
readahead-laptop-mode.patch
readahead-loop-case.patch
readahead-nfsd-case.patch
readahead-turn-on-by-default.patch
readahead-debug-radix-tree-new-functions.patch
readahead-debug-traces-showing-accessed-file-names.patch
readahead-debug-traces-showing-read-patterns.patch
readahead-backoff-on-i-o-error.patch
readahead-remove-size-limit-on-read_ahead_kb.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
