summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2009-06-23 01:57:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 19:17:28 +0200
commitcb4cbcf6b3cf79f80c157afdc8dd8221643d8481 (patch)
treea328516967ad0daeff9702a2cf5760fb25fd26a7
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff)
downloadlinux-cb4cbcf6b3cf79f80c157afdc8dd8221643d8481.tar.xz
linux-cb4cbcf6b3cf79f80c157afdc8dd8221643d8481.zip
mm: fix incorrect page removal from LRU
The isolated page is "cursor_page" not "page". This could cause LRU list corruption under memory pressure, caught by CONFIG_DEBUG_LIST. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Reviewed-by: Balbir Singh <balbir@linux.vnet.ibm.com> Tested-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/vmscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index e8fa2d9eb212..54155268dfca 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -932,7 +932,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
continue;
if (__isolate_lru_page(cursor_page, mode, file) == 0) {
list_move(&cursor_page->lru, dst);
- mem_cgroup_del_lru(page);
+ mem_cgroup_del_lru(cursor_page);
nr_taken++;
scan++;
}