From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

This unlock_page_cgroup() is unnecessary.

Changelog: v1 -> v2
 * adjusted to 2.6.23-mm1

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Paul Menage <menage@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Kirill Korotaev <dev@sw.ru>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: David Rientjes <rientjes@google.com>
Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memcontrol.c |    2 --
 1 file changed, 2 deletions(-)

diff -puN mm/memcontrol.c~bugfix-for-memory-cgroup-controller-fix-error-handling-path-in-mem_charge_cgroup mm/memcontrol.c
--- a/mm/memcontrol.c~bugfix-for-memory-cgroup-controller-fix-error-handling-path-in-mem_charge_cgroup
+++ a/mm/memcontrol.c
@@ -392,9 +392,7 @@ done:
 	return 0;
 free_pc:
 	kfree(pc);
-	return -ENOMEM;
 err:
-	unlock_page_cgroup(page);
 	return -ENOMEM;
 }
 
_