mm: memcontrol: push down mem_cgroup_node_nr_lru_pages()

[sfrench/cifs-2.6.git] / mm / workingset.c

diff --git a/mm/workingset.c b/mm/workingset.c
index 0bedf67502d54525fb7ac9626dbceb84572c26ca..6419baebd3065d163c7a93039493fe9856df9a72 100644 (file)
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -426,10 +426,11 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
 #ifdef CONFIG_MEMCG
        if (sc->memcg) {
                struct lruvec *lruvec;
+               int i;
 
-               pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
-                                                    LRU_ALL);
                lruvec = mem_cgroup_lruvec(NODE_DATA(sc->nid), sc->memcg);
+               for (pages = 0, i = 0; i < NR_LRU_LISTS; i++)
+                       pages += lruvec_page_state(lruvec, NR_LRU_BASE + i);
                pages += lruvec_page_state(lruvec, NR_SLAB_RECLAIMABLE);
                pages += lruvec_page_state(lruvec, NR_SLAB_UNRECLAIMABLE);
        } else