[PATCH] migration: remove unnecessary PageSwapCache checks

Remove two unnecessary PageSwapCache checks.  The page refcount is raised
and therefore page migration cannot occur in both functions.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 0 insertions, 7 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index e5fd5385f0cc..47a6812f5f8c 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -716,7 +716,6 @@ static int try_to_unuse(unsigned int type)
                  */
                 swap_map = &si->swap_map[i];
                 entry = swp_entry(type, i);
-again:
                 page = read_swap_cache_async(entry, NULL, 0);
                 if (!page) {
                         /*
@@ -751,12 +750,6 @@ again:
                 wait_on_page_locked(page);
                 wait_on_page_writeback(page);
                 lock_page(page);
-                if (!PageSwapCache(page)) {
-                        /* Page migration has occured */
-                        unlock_page(page);
-                        page_cache_release(page);
-                        goto again;
-                }
                 wait_on_page_writeback(page);
 
                 /*