Commit 2b359d55 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

[PATCH] readahead: unneeded prev_page assignments

There is no point in setting ra->prev_page before 'goto out', it will be
overwritten anyway.
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 19229798
...@@ -432,7 +432,6 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra, ...@@ -432,7 +432,6 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
if (newsize == 0 || (ra->flags & RA_FLAG_INCACHE)) { if (newsize == 0 || (ra->flags & RA_FLAG_INCACHE)) {
newsize = 1; newsize = 1;
ra->prev_page = offset;
goto out; /* No readahead or file already in cache */ goto out; /* No readahead or file already in cache */
} }
/* /*
...@@ -443,7 +442,6 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra, ...@@ -443,7 +442,6 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
if ((ra->size == 0 && offset == 0) /* first io and start of file */ if ((ra->size == 0 && offset == 0) /* first io and start of file */
|| (ra->size == -1 && ra->prev_page == offset - 1)) { || (ra->size == -1 && ra->prev_page == offset - 1)) {
/* First sequential */ /* First sequential */
ra->prev_page = offset + newsize - 1;
ra->size = get_init_ra_size(newsize, max); ra->size = get_init_ra_size(newsize, max);
ra->start = offset; ra->start = offset;
if (!blockable_page_cache_readahead(mapping, filp, offset, if (!blockable_page_cache_readahead(mapping, filp, offset,
...@@ -475,7 +473,6 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra, ...@@ -475,7 +473,6 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
*/ */
if ((offset != (ra->prev_page+1) || (ra->size == 0))) { if ((offset != (ra->prev_page+1) || (ra->size == 0))) {
ra_off(ra); ra_off(ra);
ra->prev_page = offset + newsize - 1;
blockable_page_cache_readahead(mapping, filp, offset, blockable_page_cache_readahead(mapping, filp, offset,
newsize, ra, 1); newsize, ra, 1);
goto out; goto out;
...@@ -545,7 +542,7 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra, ...@@ -545,7 +542,7 @@ page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
out: out:
ra->prev_page = offset + newsize - 1; ra->prev_page = offset + newsize - 1;
return(newsize); return newsize;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment