From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 9 Nov 2012 03:04:30 +0000 (+1100)
Subject: mm-adjust-address_space_operationsmigratepage-return-code-fix
X-Git-Tag: next-20121112~5^2~157
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=909e45ab8d59fa39367506b3ead3c9e26c1007f0;p=karo-tx-linux.git

mm-adjust-address_space_operationsmigratepage-return-code-fix

Cc: Rafael Aquini <aquini@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/migrate.c b/mm/migrate.c
index 10c77c0154b4..2424efba605d 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -996,15 +996,12 @@ int migrate_pages(struct list_head *from,
 			}
 		}
 	}
-	rc = 0;
+	rc = nr_failed + retry;
 out:
 	if (!swapwrite)
 		current->flags &= ~PF_SWAPWRITE;
 
-	if (rc != MIGRATEPAGE_SUCCESS)
-		return rc;
-
-	return nr_failed + retry;
+	return rc;
 }
 
 int migrate_huge_page(struct page *hpage, new_page_t get_new_page,