From 44ebf0e6ef819103de324e13c3e052cc6b38b43e Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Tue, 24 May 2011 17:12:20 -0700
Subject: [PATCH] --- yaml --- r: 250907 b: refs/heads/master c:
 bd486285f24ac2fd1ff64688fb0729712c5712c4 h: refs/heads/master i:   250905:
 7572ea2b579ddc064c4879ee487979ed2e76d091   250903:
 bab40a45e03a4b4832d0a98b2fff6f9ff52baeee v: v3

---
 [refs]                    |  2 +-
 trunk/mm/memory-failure.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b13f213744dc..714190f58283 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 700c2a46e88265326764197d5b8842490bae5569
+refs/heads/master: bd486285f24ac2fd1ff64688fb0729712c5712c4
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index 12178ec32ab5..369b80e81416 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -1440,16 +1440,12 @@ int soft_offline_page(struct page *page, int flags)
 	 */
 	ret = invalidate_inode_page(page);
 	unlock_page(page);
-
 	/*
-	 * Drop count because page migration doesn't like raised
-	 * counts. The page could get re-allocated, but if it becomes
-	 * LRU the isolation will just fail.
 	 * RED-PEN would be better to keep it isolated here, but we
 	 * would need to fix isolation locking first.
 	 */
-	put_page(page);
 	if (ret == 1) {
+		put_page(page);
 		ret = 0;
 		pr_info("soft_offline: %#lx: invalidated\n", pfn);
 		goto done;
@@ -1461,6 +1457,11 @@ int soft_offline_page(struct page *page, int flags)
 	 * handles a large number of cases for us.
 	 */
 	ret = isolate_lru_page(page);
+	/*
+	 * Drop page reference which is came from get_any_page()
+	 * successful isolate_lru_page() already took another one.
+	 */
+	put_page(page);
 	if (!ret) {
 		LIST_HEAD(pagelist);