Commit 8ca8e975 authored by Daisuke Nishimura's avatar Daisuke Nishimura Committed by James Toy

refcount of the "victim" should be decremented before exiting the loop.

Signed-off-by: default avatarDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent aa68a626
...@@ -1133,8 +1133,10 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, ...@@ -1133,8 +1133,10 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
* anything, it might because there are * anything, it might because there are
* no reclaimable pages under this hierarchy * no reclaimable pages under this hierarchy
*/ */
if (!check_soft || !total) if (!check_soft || !total) {
css_put(&victim->css);
break; break;
}
/* /*
* We want to do more targetted reclaim. * We want to do more targetted reclaim.
* excess >> 2 is not to excessive so as to * excess >> 2 is not to excessive so as to
...@@ -1142,10 +1144,12 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, ...@@ -1142,10 +1144,12 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
* coming back to reclaim from this cgroup * coming back to reclaim from this cgroup
*/ */
if (total >= (excess >> 2) || if (total >= (excess >> 2) ||
(loop > MEM_CGROUP_MAX_RECLAIM_LOOPS)) (loop > MEM_CGROUP_MAX_RECLAIM_LOOPS)) {
css_put(&victim->css);
break; break;
} }
} }
}
if (!mem_cgroup_local_usage(&victim->stat)) { if (!mem_cgroup_local_usage(&victim->stat)) {
/* this cgroup's local usage == 0 */ /* this cgroup's local usage == 0 */
css_put(&victim->css); css_put(&victim->css);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment