mm: memcontrol: don't count limit-setting reclaim as memory pressure

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

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 5747867f0082fe039cfc2ad6d24a4ab902be53c9..23156c252e0a157d182500a512bc593f8ab5bd49 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3310,7 +3310,6 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,
                                           bool may_swap)
 {
        unsigned long nr_reclaimed;
-       unsigned long pflags;
        unsigned int noreclaim_flag;
        struct scan_control sc = {
                .nr_to_reclaim = max(nr_pages, SWAP_CLUSTER_MAX),
@@ -3331,17 +3330,12 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,
        struct zonelist *zonelist = node_zonelist(numa_node_id(), sc.gfp_mask);
 
        set_task_reclaim_state(current, &sc.reclaim_state);
-
        trace_mm_vmscan_memcg_reclaim_begin(0, sc.gfp_mask);
-
-       psi_memstall_enter(&pflags);
        noreclaim_flag = memalloc_noreclaim_save();
 
        nr_reclaimed = do_try_to_free_pages(zonelist, &sc);
 
        memalloc_noreclaim_restore(noreclaim_flag);
-       psi_memstall_leave(&pflags);
-
        trace_mm_vmscan_memcg_reclaim_end(nr_reclaimed);
        set_task_reclaim_state(current, NULL);