tree 0a905aa1558af7fd401d768ead121e2b11a4a2f4
parent 28bd65781c848d95ba6a7f58b5c4b8265a804ec6
author KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> 1295996847 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1296003003 +1000

memcg: fix account leak at failure of memsw acconting

Commit 4b53433468 ("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: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: <stable@kernel.org>	[2.6.36+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>