[PATCH 1/3] memcg: fix account leak at failure of memsw acconting.

From: KAMEZAWA Hiroyuki
Date: Tue Jan 25 2011 - 01:06:48 EST

This is required for 2.6.36-stable and later.
Commit 4b53433468c87794b523e4683fbd4e8e8aca1f63 removes
a cancel of charge at case:
memory charge-> success.
mem+swap charge-> failure.

This leaks usage of memory. Fix it.

This patch is required for stable tree since 2.6.36.

CC: stable@xxxxxxxxxx
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
mm/memcontrol.c | 1 +
1 file changed, 1 insertion(+)

Index: linux-2.6.38-rc2/mm/memcontrol.c
--- linux-2.6.38-rc2.orig/mm/memcontrol.c
+++ linux-2.6.38-rc2/mm/memcontrol.c
@@ -1832,6 +1832,7 @@ static int __mem_cgroup_do_charge(struct
if (likely(!ret))
return CHARGE_OK;

+ res_counter_uncharge(&mem->res, csize);
mem_over_limit = mem_cgroup_from_res_counter(fail_res, memsw);
} else

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/