summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2007-07-08 01:13:06 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-08 10:13:21 -0700
commit4e99325b462ba18075768582621af74a6b79d2a5 (patch)
treec10d5cca6c42dda86faa3881e406475d8d645764
parent95511ad4342cd094e62c807f6631b9a19cc6b129 (diff)
downloadlinux-4e99325b462ba18075768582621af74a6b79d2a5.tar.gz
linux-4e99325b462ba18075768582621af74a6b79d2a5.tar.bz2
linux-4e99325b462ba18075768582621af74a6b79d2a5.zip
mm: double mark_page_accessed() in read_cache_page_async()
Fix a post-2.6.21 regression. read_cache_page_async() has two invocations of mark_page_accessed() which will launch pages right onto the active list. Remove the first one, keeping the latter one. This avoids marking unwanted pages active (in the retry loop). Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/filemap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index edb1b0b5cc8d..d1d9814f99dd 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1786,7 +1786,6 @@ retry:
page = __read_cache_page(mapping, index, filler, data);
if (IS_ERR(page))
return page;
- mark_page_accessed(page);
if (PageUptodate(page))
goto out;