summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2011-03-23 16:42:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 19:46:28 -0700
commit4dc03de1b29901b61cb27e4cab44a7f578dc0fc9 (patch)
tree4edca28cf1636015eacd8012023804e4f27b2e34
parent6b3ae58efca06623c197fd6d91ded4aa3a8fe039 (diff)
downloadlinux-stable-4dc03de1b29901b61cb27e4cab44a7f578dc0fc9.tar.gz
linux-stable-4dc03de1b29901b61cb27e4cab44a7f578dc0fc9.tar.bz2
linux-stable-4dc03de1b29901b61cb27e4cab44a7f578dc0fc9.zip
memcg: charged pages always have valid per-memcg zone info
page_cgroup_zoneinfo() will never return NULL for a charged page, remove the check for it in mem_cgroup_get_reclaim_stat_from_page(). Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Balbir Singh <balbir@linux.vnet.ibm.com> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 660dfc27d971..b35a28d80ab5 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1043,9 +1043,6 @@ mem_cgroup_get_reclaim_stat_from_page(struct page *page)
/* Ensure pc->mem_cgroup is visible after reading PCG_USED. */
smp_rmb();
mz = page_cgroup_zoneinfo(pc->mem_cgroup, page);
- if (!mz)
- return NULL;
-
return &mz->reclaim_stat;
}