Daisuke Nishimura 50de1dd967 memcg: fix memory migration of shmem swapcache ... In the current implementation mem_cgroup_end_migration() decides whether the page migration has succeeded or not by checking "oldpage->mapping". But if we are tring to migrate a shmem swapcache, the page->mapping of it is NULL from the begining, so the check would be invalid. As a result, mem_cgroup_end_migration() assumes the migration has succeeded even if it's not, so "newpage" would be freed while it's not uncharged. This patch fixes it by passing mem_cgroup_end_migration() the result of the page migration. Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Minchan Kim <minchan.kim@gmail.com> Reviewed-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2011-01-13 17:32:51 -08:00
..
backing-dev.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-10-26 17:58:44 -07:00
bootmem.c	x86, memblock: Replace e820_/_early string with memblock_	2010-08-27 11:13:47 -07:00
bounce.c	bounce: call flush_dcache_page() after bounce_copy_vec()	2010-09-09 18:57:25 -07:00
compaction.c	thp: use compaction for all allocation orders	2011-01-13 17:32:46 -08:00
debug-pagealloc.c
dmapool.c	mm/dmapool.c: use TASK_UNINTERRUPTIBLE in dma_pool_alloc()	2011-01-13 17:32:48 -08:00
fadvise.c
failslab.c
filemap_xip.c
filemap.c	mm: remove likely() from grab_cache_page_write_begin()	2011-01-13 17:32:36 -08:00
fremap.c	Avoid pgoff overflow in remap_file_pages	2010-09-25 09:34:58 -07:00
highmem.c	mm,x86: fix kmap_atomic_push vs ioremap_32.c	2010-10-27 18:03:05 -07:00
huge_memory.c	thp: khugepaged: make khugepaged aware about madvise	2011-01-13 17:32:47 -08:00
hugetlb.c	hugetlb: fix handling of parse errors in sysfs	2011-01-13 17:32:49 -08:00
hwpoison-inject.c
init-mm.c
internal.h	mm: batch activate_page() to reduce lock contention	2011-01-13 17:32:50 -08:00
Kconfig	thp: select CONFIG_COMPACTION if TRANSPARENT_HUGEPAGE enabled	2011-01-13 17:32:45 -08:00
Kconfig.debug
kmemcheck.c
kmemleak-test.c
kmemleak.c
ksm.c	ksm: drain pagevecs to lru	2011-01-13 17:32:49 -08:00
maccess.c	MN10300: Save frame pointer in thread_info struct rather than global var	2010-10-27 17:29:01 +01:00
madvise.c	thp: khugepaged: make khugepaged aware about madvise	2011-01-13 17:32:47 -08:00
Makefile	thp: transparent hugepage core	2011-01-13 17:32:42 -08:00
memblock.c	memblock: Annotate memblock functions with __init_memblock	2010-10-11 16:00:52 -07:00
memcontrol.c	memcg: fix memory migration of shmem swapcache	2011-01-13 17:32:51 -08:00
memory_hotplug.c	thp: remove PG_buddy	2011-01-13 17:32:43 -08:00
memory-failure.c	thp: compound_trans_order	2011-01-13 17:32:47 -08:00
memory.c	thp: add debug checks for mapcount related invariants	2011-01-13 17:32:47 -08:00
mempolicy.c	thp: add numa awareness to hugepage allocations	2011-01-13 17:32:45 -08:00
mempool.c
migrate.c	memcg: fix memory migration of shmem swapcache	2011-01-13 17:32:51 -08:00
mincore.c	thp: mincore transparent hugepage support	2011-01-13 17:32:44 -08:00
mlock.c	mlock: do not hold mmap_sem for extended periods of time	2011-01-13 17:32:36 -08:00
mm_init.c
mmap.c	brk: fix min_brk lower bound computation for COMPAT_BRK	2011-01-13 17:32:48 -08:00
mmu_context.c
mmu_notifier.c	thp: mmu_notifier_test_young	2011-01-13 17:32:46 -08:00
mmzone.c	mm: page allocator: adjust the per-cpu counter threshold when memory is low	2011-01-13 17:32:31 -08:00
mprotect.c	thp: mprotect: transparent huge page support	2011-01-13 17:32:44 -08:00
mremap.c	thp: split_huge_page_mm/vma	2011-01-13 17:32:41 -08:00
msync.c
nommu.c	mlock: do not hold mmap_sem for extended periods of time	2011-01-13 17:32:36 -08:00
oom_kill.c	oom: kill all threads sharing oom killed task's mm	2010-10-26 16:52:05 -07:00
page_alloc.c	mm/page_alloc.c: don't cache `current' in a local	2011-01-13 17:32:49 -08:00
page_cgroup.c
page_io.c
page_isolation.c	mm: page_isolation: codeclean fix comment and rm unneeded val init	2010-10-26 16:52:11 -07:00
page-writeback.c	writeback: avoid unnecessary determine_dirtyable_memory call	2011-01-13 17:32:38 -08:00
pagewalk.c	thp: split_huge_page_mm/vma	2011-01-13 17:32:41 -08:00
percpu-km.c	percpu: clear memory allocated with the km allocator	2010-10-02 10:28:42 +03:00
percpu-vm.c	mm: remove gfp mask from pcpu_get_vm_areas	2011-01-13 17:32:34 -08:00
percpu.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
pgtable-generic.c	thp: add pmd mangling generic functions	2011-01-13 17:32:40 -08:00
prio_tree.c
quicklist.c
readahead.c
rmap.c	memcg: create extensible page stat update routines	2011-01-13 17:32:50 -08:00
shmem.c	fs: icache RCU free inodes	2011-01-07 17:50:26 +11:00
slab.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6	2011-01-10 08:38:01 -08:00
slob.c	kernel: kmem_ptr_validate considered harmful	2011-01-07 17:50:16 +11:00
slub.c	mm: convert sprintf_symbol to %pS	2011-01-13 17:32:33 -08:00
sparse-vmemmap.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
sparse.c	thp: remove PG_buddy	2011-01-13 17:32:43 -08:00
swap_state.c	thp: split_huge_page paging	2011-01-13 17:32:41 -08:00
swap.c	mm: batch activate_page() to reduce lock contention	2011-01-13 17:32:50 -08:00
swapfile.c	thp: split_huge_page paging	2011-01-13 17:32:41 -08:00
thrash.c
truncate.c	Call the filesystem back whenever a page is removed from the page cache	2010-12-02 09:55:21 -05:00
util.c	kernel: kmem_ptr_validate considered harmful	2011-01-07 17:50:16 +11:00
vmalloc.c	vmalloc: remove redundant unlikely()	2011-01-13 17:32:36 -08:00
vmscan.c	mm: batch activate_page() to reduce lock contention	2011-01-13 17:32:50 -08:00
vmstat.c	thp: transparent hugepage vmstat	2011-01-13 17:32:43 -08:00