mm/vmscan: throttle reclaim when no progress is being made

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

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index cf0321d7a7842cfc1e0f49d07ec334a5b8cbd8d5..965b3cf7046b31d628e961c55e9904a45a96746c 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3487,19 +3487,11 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg)
 
        /* try to free all pages in this cgroup */
        while (nr_retries && page_counter_read(&memcg->memory)) {
-               int progress;
-
                if (signal_pending(current))
                        return -EINTR;
 
-               progress = try_to_free_mem_cgroup_pages(memcg, 1,
-                                                       GFP_KERNEL, true);
-               if (!progress) {
+               if (!try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true))
                        nr_retries--;
-                       /* maybe some writeback is necessary */
-                       congestion_wait(BLK_RW_ASYNC, HZ/10);
-               }
-
        }
 
        return 0;