提交 4d7dcca2 编写于 作者: H Hugh Dickins 提交者: Linus Torvalds

mm/memcg: get_lru_size not get_lruvec_size

Konstantin just introduced mem_cgroup_get_lruvec_size() and
get_lruvec_size(), I'm about to add mem_cgroup_update_lru_size(): but
we're dealing with the same thing, lru_size[lru].  We ought to agree on
the naming, and I do think lru_size is the more correct: so rename his
ones to get_lru_size().
Signed-off-by: NHugh Dickins <hughd@google.com>
Acked-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: NKonstantin Khlebnikov <khlebnikov@openvz.org>
Acked-by: NMichal Hocko <mhocko@suse.cz>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 af7c4b0e
...@@ -121,7 +121,7 @@ void mem_cgroup_iter_break(struct mem_cgroup *, struct mem_cgroup *); ...@@ -121,7 +121,7 @@ void mem_cgroup_iter_break(struct mem_cgroup *, struct mem_cgroup *);
int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec); int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec);
int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec); int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec);
int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);
unsigned long mem_cgroup_get_lruvec_size(struct lruvec *lruvec, enum lru_list); unsigned long mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list);
struct zone_reclaim_stat* struct zone_reclaim_stat*
mem_cgroup_get_reclaim_stat_from_page(struct page *page); mem_cgroup_get_reclaim_stat_from_page(struct page *page);
extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
...@@ -340,7 +340,7 @@ mem_cgroup_inactive_file_is_low(struct lruvec *lruvec) ...@@ -340,7 +340,7 @@ mem_cgroup_inactive_file_is_low(struct lruvec *lruvec)
} }
static inline unsigned long static inline unsigned long
mem_cgroup_get_lruvec_size(struct lruvec *lruvec, enum lru_list lru) mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
{ {
return 0; return 0;
} }
......
...@@ -737,7 +737,7 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, ...@@ -737,7 +737,7 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg,
} }
unsigned long unsigned long
mem_cgroup_get_lruvec_size(struct lruvec *lruvec, enum lru_list lru) mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
{ {
struct mem_cgroup_per_zone *mz; struct mem_cgroup_per_zone *mz;
...@@ -1229,8 +1229,8 @@ int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec) ...@@ -1229,8 +1229,8 @@ int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec)
unsigned long active; unsigned long active;
unsigned long gb; unsigned long gb;
inactive = mem_cgroup_get_lruvec_size(lruvec, LRU_INACTIVE_ANON); inactive = mem_cgroup_get_lru_size(lruvec, LRU_INACTIVE_ANON);
active = mem_cgroup_get_lruvec_size(lruvec, LRU_ACTIVE_ANON); active = mem_cgroup_get_lru_size(lruvec, LRU_ACTIVE_ANON);
gb = (inactive + active) >> (30 - PAGE_SHIFT); gb = (inactive + active) >> (30 - PAGE_SHIFT);
if (gb) if (gb)
...@@ -1246,8 +1246,8 @@ int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec) ...@@ -1246,8 +1246,8 @@ int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec)
unsigned long active; unsigned long active;
unsigned long inactive; unsigned long inactive;
inactive = mem_cgroup_get_lruvec_size(lruvec, LRU_INACTIVE_FILE); inactive = mem_cgroup_get_lru_size(lruvec, LRU_INACTIVE_FILE);
active = mem_cgroup_get_lruvec_size(lruvec, LRU_ACTIVE_FILE); active = mem_cgroup_get_lru_size(lruvec, LRU_ACTIVE_FILE);
return (active > inactive); return (active > inactive);
} }
......
...@@ -145,10 +145,10 @@ static bool global_reclaim(struct scan_control *sc) ...@@ -145,10 +145,10 @@ static bool global_reclaim(struct scan_control *sc)
} }
#endif #endif
static unsigned long get_lruvec_size(struct lruvec *lruvec, enum lru_list lru) static unsigned long get_lru_size(struct lruvec *lruvec, enum lru_list lru)
{ {
if (!mem_cgroup_disabled()) if (!mem_cgroup_disabled())
return mem_cgroup_get_lruvec_size(lruvec, lru); return mem_cgroup_get_lru_size(lruvec, lru);
return zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru); return zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru);
} }
...@@ -1608,10 +1608,10 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, ...@@ -1608,10 +1608,10 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
goto out; goto out;
} }
anon = get_lruvec_size(lruvec, LRU_ACTIVE_ANON) + anon = get_lru_size(lruvec, LRU_ACTIVE_ANON) +
get_lruvec_size(lruvec, LRU_INACTIVE_ANON); get_lru_size(lruvec, LRU_INACTIVE_ANON);
file = get_lruvec_size(lruvec, LRU_ACTIVE_FILE) + file = get_lru_size(lruvec, LRU_ACTIVE_FILE) +
get_lruvec_size(lruvec, LRU_INACTIVE_FILE); get_lru_size(lruvec, LRU_INACTIVE_FILE);
if (global_reclaim(sc)) { if (global_reclaim(sc)) {
free = zone_page_state(zone, NR_FREE_PAGES); free = zone_page_state(zone, NR_FREE_PAGES);
...@@ -1674,7 +1674,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, ...@@ -1674,7 +1674,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
int file = is_file_lru(lru); int file = is_file_lru(lru);
unsigned long scan; unsigned long scan;
scan = get_lruvec_size(lruvec, lru); scan = get_lru_size(lruvec, lru);
if (sc->priority || noswap || !vmscan_swappiness(sc)) { if (sc->priority || noswap || !vmscan_swappiness(sc)) {
scan >>= sc->priority; scan >>= sc->priority;
if (!scan && force_scan) if (!scan && force_scan)
...@@ -1743,10 +1743,9 @@ static inline bool should_continue_reclaim(struct lruvec *lruvec, ...@@ -1743,10 +1743,9 @@ static inline bool should_continue_reclaim(struct lruvec *lruvec,
* inactive lists are large enough, continue reclaiming * inactive lists are large enough, continue reclaiming
*/ */
pages_for_compaction = (2UL << sc->order); pages_for_compaction = (2UL << sc->order);
inactive_lru_pages = get_lruvec_size(lruvec, LRU_INACTIVE_FILE); inactive_lru_pages = get_lru_size(lruvec, LRU_INACTIVE_FILE);
if (nr_swap_pages > 0) if (nr_swap_pages > 0)
inactive_lru_pages += get_lruvec_size(lruvec, inactive_lru_pages += get_lru_size(lruvec, LRU_INACTIVE_ANON);
LRU_INACTIVE_ANON);
if (sc->nr_reclaimed < pages_for_compaction && if (sc->nr_reclaimed < pages_for_compaction &&
inactive_lru_pages > pages_for_compaction) inactive_lru_pages > pages_for_compaction)
return true; return true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册