path: root/mm
diff options
authorAndrew Morton <akpm@linux-foundation.org>2013-09-24 15:27:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-24 17:00:25 -0700
commit3120055e869f2a208480f238680d097eec8f0e02 (patch)
tree0d3c4d85800f2ab0ba1c70e3b8aaf25c630cacf4 /mm
parent8f939a9f4c769500c58c31ec81ce17297388f4bf (diff)
revert "memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything"
Revert commit e839b6a1c8d0 ("memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything") I merged this prematurely - Michal and Johannes still disagree about the overall design direction and the future remains unclear. Cc: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
2 files changed, 2 insertions, 8 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 5ee0af463f2..5cf7726764c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1872,11 +1872,7 @@ enum mem_cgroup_filter_t
mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg,
struct mem_cgroup *root)
- struct mem_cgroup *parent;
- if (!memcg)
- memcg = root_mem_cgroup;
- parent = memcg;
+ struct mem_cgroup *parent = memcg;
if (res_counter_soft_limit_excess(&memcg->res))
return VISIT;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 97b0ed16749..cdd300b8148 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -142,9 +142,7 @@ static bool global_reclaim(struct scan_control *sc)
static bool mem_cgroup_should_soft_reclaim(struct scan_control *sc)
- struct mem_cgroup *root = sc->target_mem_cgroup;
- return !mem_cgroup_disabled() &&
- mem_cgroup_soft_reclaim_eligible(root, root) != SKIP_TREE;
+ return !mem_cgroup_disabled();
static bool global_reclaim(struct scan_control *sc)