git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
mm
/
readahead.c
diff --git
a/mm/readahead.c
b/mm/readahead.c
index
7073392
..
9723956
100644
(file)
--- a/
mm/readahead.c
+++ b/
mm/readahead.c
@@
-349,6
+349,7
@@
page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
struct file *filp, unsigned long offset)
{
unsigned max;
struct file *filp, unsigned long offset)
{
unsigned max;
+ unsigned min;
unsigned orig_next_size;
unsigned actual;
int first_access=0;
unsigned orig_next_size;
unsigned actual;
int first_access=0;
@@
-373,6
+374,7
@@
page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
if (max == 0)
goto out; /* No readahead */
if (max == 0)
goto out; /* No readahead */
+ min = get_min_readahead(ra);
orig_next_size = ra->next_size;
if (ra->next_size == 0) {
orig_next_size = ra->next_size;
if (ra->next_size == 0) {
@@
-468,11
+470,7
@@
do_io:
* pages shall be accessed in the next
* current window.
*/
* pages shall be accessed in the next
* current window.
*/
- average = ra->average;
- if (ra->serial_cnt > average)
- average = (ra->serial_cnt + ra->average + 1) / 2;
-
- ra->next_size = min(average , (unsigned long)max);
+ ra->next_size = min(ra->average , (unsigned long)max);
}
ra->start = offset;
ra->size = ra->next_size;
}
ra->start = offset;
ra->size = ra->next_size;
@@
-554,7
+552,6
@@
void handle_ra_miss(struct address_space *mapping,
ra->size = max;
ra->ahead_start = 0;
ra->ahead_size = 0;
ra->size = max;
ra->ahead_start = 0;
ra->ahead_size = 0;
- ra->average = max / 2;
}
}
ra->prev_page = offset;
}
}
ra->prev_page = offset;