Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c88e2d authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

memcg: fix account leak at failure of memsw acconting 



Commit 4b534334 ("memcg: clean up try_charge main loop") removes a
cancel of charge at case: memory charge-> success.  mem+swap charge->
failure.

This leaks usage of memory.  Fix it.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: <stable@kernel.org>	[2.6.36+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 28bd6578

mm/memcontrol.c

+1 −0
Original line number Diff line number Diff line
@@ -1832,6 +1832,7 @@ static int __mem_cgroup_do_charge(struct mem_cgroup *mem, gfp_t gfp_mask, 
		if (likely(!ret))

			return CHARGE_OK;



		res_counter_uncharge(&mem->res, csize);

		mem_over_limit = mem_cgroup_from_res_counter(fail_res, memsw);

		flags |= MEM_CGROUP_RECLAIM_NOSWAP;

	} else