From: Hillf Danton <dhillf@gmail.com>
Date: Thu, 8 Dec 2011 22:34:20 +0000 (-0800)
Subject: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages
X-Git-Tag: v3.2-rc5~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=09761333ed47e899cc1482c13090b95f3f711971;p=~emulex%2Finfiniband.git

mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages

Avoid unlocking and unlocked page if we failed to lock it.

Signed-off-by: Hillf Danton <dhillf@gmail.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/migrate.c b/mm/migrate.c
index 578e29174fa..177aca424a0 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -871,9 +871,9 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 
 	if (anon_vma)
 		put_anon_vma(anon_vma);
-out:
 	unlock_page(hpage);
 
+out:
 	if (rc != -EAGAIN) {
 		list_del(&hpage->lru);
 		put_page(hpage);