Commit 13d7e3a2dba6a79589ed34dc0b9114d7b5ff9eab
Committed by
Linus Torvalds
1 parent
00918b6ab8
Exists in
master
and in
4 other branches
memcg: convert to use zone_to_nid() from bare zone->zone_pgdat->node_id
We have zone_to_nid(). this patch convert all existing users of zone->zone_pgdat->node_id. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Nishimura Daisuke <d-nishimura@mtf.biglobe.ne.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
mm/memcontrol.c
... | ... | @@ -919,7 +919,7 @@ |
919 | 919 | struct zone *zone, |
920 | 920 | enum lru_list lru) |
921 | 921 | { |
922 | - int nid = zone->zone_pgdat->node_id; | |
922 | + int nid = zone_to_nid(zone); | |
923 | 923 | int zid = zone_idx(zone); |
924 | 924 | struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid); |
925 | 925 | |
... | ... | @@ -929,7 +929,7 @@ |
929 | 929 | struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, |
930 | 930 | struct zone *zone) |
931 | 931 | { |
932 | - int nid = zone->zone_pgdat->node_id; | |
932 | + int nid = zone_to_nid(zone); | |
933 | 933 | int zid = zone_idx(zone); |
934 | 934 | struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid); |
935 | 935 | |
... | ... | @@ -974,7 +974,7 @@ |
974 | 974 | LIST_HEAD(pc_list); |
975 | 975 | struct list_head *src; |
976 | 976 | struct page_cgroup *pc, *tmp; |
977 | - int nid = z->zone_pgdat->node_id; | |
977 | + int nid = zone_to_nid(z); | |
978 | 978 | int zid = zone_idx(z); |
979 | 979 | struct mem_cgroup_per_zone *mz; |
980 | 980 | int lru = LRU_FILE * file + active; |