tree 856aac72b818de4f52ce38448b852930554b3efa
parent 47c59803becb55b72b26cdab3838d621a15badc8
author KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> 1224386888 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224517958 -0700

memcg: move charge swapin under lock

While page-cache's charge/uncharge is done under page_lock(), swap-cache
isn't.  (anonymous page is charged when it's newly allocated.)

This patch moves do_swap_page()'s charge() call under lock.  I don't see
any bad problem *now* but this fix will be good for future for avoiding
unnecessary racy state.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>