diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2011-03-23 19:42:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 22:46:28 -0400 |
commit | 4dc03de1b29901b61cb27e4cab44a7f578dc0fc9 (patch) | |
tree | 4edca28cf1636015eacd8012023804e4f27b2e34 /mm/memcontrol.c | |
parent | 6b3ae58efca06623c197fd6d91ded4aa3a8fe039 (diff) |
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>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 3 |
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) | |||
1043 | /* Ensure pc->mem_cgroup is visible after reading PCG_USED. */ | 1043 | /* Ensure pc->mem_cgroup is visible after reading PCG_USED. */ |
1044 | smp_rmb(); | 1044 | smp_rmb(); |
1045 | mz = page_cgroup_zoneinfo(pc->mem_cgroup, page); | 1045 | mz = page_cgroup_zoneinfo(pc->mem_cgroup, page); |
1046 | if (!mz) | ||
1047 | return NULL; | ||
1048 | |||
1049 | return &mz->reclaim_stat; | 1046 | return &mz->reclaim_stat; |
1050 | } | 1047 | } |
1051 | 1048 | ||