mm, memcg: move memcg limit enforcement from zones to nodes

[linux.git] / mm / workingset.c

diff --git a/mm/workingset.c b/mm/workingset.c
index df0dacaf54ee18112ea159e2bdb4de8296dd1e3a..2af14bb5a34995938bde4038edc0af6d34d5a5db 100644 (file)
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -218,7 +218,7 @@ void *workingset_eviction(struct address_space *mapping, struct page *page)
        VM_BUG_ON_PAGE(page_count(page), page);
        VM_BUG_ON_PAGE(!PageLocked(page), page);
 
-       lruvec = mem_cgroup_lruvec(zone->zone_pgdat, zone, memcg);
+       lruvec = mem_cgroup_lruvec(zone->zone_pgdat, memcg);
        eviction = atomic_long_inc_return(&lruvec->inactive_age);
        return pack_shadow(memcgid, zone, eviction);
 }
@@ -267,7 +267,7 @@ bool workingset_refault(void *shadow)
                rcu_read_unlock();
                return false;
        }
-       lruvec = mem_cgroup_lruvec(zone->zone_pgdat, zone, memcg);
+       lruvec = mem_cgroup_lruvec(zone->zone_pgdat, memcg);
        refault = atomic_long_read(&lruvec->inactive_age);
        active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE);
        rcu_read_unlock();
@@ -319,7 +319,7 @@ void workingset_activation(struct page *page)
        memcg = page_memcg_rcu(page);
        if (!mem_cgroup_disabled() && !memcg)
                goto out;
-       lruvec = mem_cgroup_lruvec(page_pgdat(page), page_zone(page), memcg);
+       lruvec = mem_cgroup_lruvec(page_pgdat(page), memcg);
        atomic_long_inc(&lruvec->inactive_age);
 out:
        rcu_read_unlock();