2007-01-06 07:27:10

by Wu Fengguang

[permalink] [raw]
Subject: [PATCH 5/6] readahead: call scheme: remove get_readahead_bounds()

Remove the one and only get_readahead_bounds() call.

Signed-off-by: Fengguang Wu <[email protected]>

---
mm/readahead.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

--- linux-2.6.20-rc3-mm1.orig/mm/readahead.c
+++ linux-2.6.20-rc3-mm1/mm/readahead.c
@@ -1572,7 +1572,6 @@ page_cache_readahead_adaptive(struct add
pgoff_t offset, unsigned long req_size)
{
unsigned long ra_size;
- unsigned long ra_min;
unsigned long ra_max;
int ret;

@@ -1593,7 +1592,7 @@ page_cache_readahead_adaptive(struct add
else if (offset)
ra_account(ra, RA_EVENT_CACHE_MISS, req_size);

- get_readahead_bounds(ra, &ra_min, &ra_max);
+ ra_max = get_max_readahead(ra);

/* read-ahead disabled? */
if (unlikely(!ra_max || !readahead_ratio)) {
@@ -1633,7 +1632,7 @@ page_cache_readahead_adaptive(struct add
* Context based sequential read-ahead.
*/
ret = try_context_based_readahead(mapping, ra, page,
- offset, ra_min, ra_max);
+ offset, req_size, ra_max);
if (ret > 0)
return ra_submit(ra, mapping, filp);
if (ret < 0)

--