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 10c77c0154b4af91122cb1c14ea7b8f62c2e6dc8..2424efba605d46cf3146b52cf0326eeb05501e31 100644 (file)
--- 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,