aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2010-08-10 21:03:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:19 -0400
commit00918b6ab89df8984ca06397cb77994dabd73f9b (patch)
tree2ca2f0f0e7f3ca235c254f05759f96f160e3c0ab
parent14fec79680f7cc4617d6ba69324e63d4a732986c (diff)
memcg: remove nid and zid argument from mem_cgroup_soft_limit_reclaim()
mem_cgroup_soft_limit_reclaim() has zone, nid and zid argument. but nid and zid can be calculated from zone. So remove it. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Mel Gorman <mel@csn.ul.ie> Cc: Balbir Singh <balbir@in.ibm.com> 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>
-rw-r--r--include/linux/memcontrol.h5
-rw-r--r--mm/memcontrol.c5
-rw-r--r--mm/vmscan.c7
3 files changed, 6 insertions, 11 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 73564cac38c7..159a0762aeaf 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -123,8 +123,7 @@ static inline bool mem_cgroup_disabled(void)
123 123
124void mem_cgroup_update_file_mapped(struct page *page, int val); 124void mem_cgroup_update_file_mapped(struct page *page, int val);
125unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, 125unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
126 gfp_t gfp_mask, int nid, 126 gfp_t gfp_mask);
127 int zid);
128u64 mem_cgroup_get_limit(struct mem_cgroup *mem); 127u64 mem_cgroup_get_limit(struct mem_cgroup *mem);
129 128
130#else /* CONFIG_CGROUP_MEM_RES_CTLR */ 129#else /* CONFIG_CGROUP_MEM_RES_CTLR */
@@ -301,7 +300,7 @@ static inline void mem_cgroup_update_file_mapped(struct page *page,
301 300
302static inline 301static inline
303unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, 302unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
304 gfp_t gfp_mask, int nid, int zid) 303 gfp_t gfp_mask)
305{ 304{
306 return 0; 305 return 0;
307} 306}
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8d0bfd7fe328..5e95996ddfb1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2865,8 +2865,7 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
2865} 2865}
2866 2866
2867unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, 2867unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
2868 gfp_t gfp_mask, int nid, 2868 gfp_t gfp_mask)
2869 int zid)
2870{ 2869{
2871 unsigned long nr_reclaimed = 0; 2870 unsigned long nr_reclaimed = 0;
2872 struct mem_cgroup_per_zone *mz, *next_mz = NULL; 2871 struct mem_cgroup_per_zone *mz, *next_mz = NULL;
@@ -2878,7 +2877,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
2878 if (order > 0) 2877 if (order > 0)
2879 return 0; 2878 return 0;
2880 2879
2881 mctz = soft_limit_tree_node_zone(nid, zid); 2880 mctz = soft_limit_tree_node_zone(zone_to_nid(zone), zone_idx(zone));
2882 /* 2881 /*
2883 * This loop can run a while, specially if mem_cgroup's continuously 2882 * This loop can run a while, specially if mem_cgroup's continuously
2884 * keep exceeding their soft limit and putting the system under 2883 * keep exceeding their soft limit and putting the system under
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 06ccda66dec0..c391c320dbaf 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2168,7 +2168,6 @@ loop_again:
2168 for (i = 0; i <= end_zone; i++) { 2168 for (i = 0; i <= end_zone; i++) {
2169 struct zone *zone = pgdat->node_zones + i; 2169 struct zone *zone = pgdat->node_zones + i;
2170 int nr_slab; 2170 int nr_slab;
2171 int nid, zid;
2172 2171
2173 if (!populated_zone(zone)) 2172 if (!populated_zone(zone))
2174 continue; 2173 continue;
@@ -2178,14 +2177,12 @@ loop_again:
2178 2177
2179 sc.nr_scanned = 0; 2178 sc.nr_scanned = 0;
2180 2179
2181 nid = pgdat->node_id;
2182 zid = zone_idx(zone);
2183 /* 2180 /*
2184 * Call soft limit reclaim before calling shrink_zone. 2181 * Call soft limit reclaim before calling shrink_zone.
2185 * For now we ignore the return value 2182 * For now we ignore the return value
2186 */ 2183 */
2187 mem_cgroup_soft_limit_reclaim(zone, order, sc.gfp_mask, 2184 mem_cgroup_soft_limit_reclaim(zone, order, sc.gfp_mask);
2188 nid, zid); 2185
2189 /* 2186 /*
2190 * We put equal pressure on every zone, unless one 2187 * We put equal pressure on every zone, unless one
2191 * zone has way too many pages free already. 2188 * zone has way too many pages free already.