2 files changed, 0 insertions, 15 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 10020d8b4073..84b5cf9b63c5 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1081,14 +1081,6 @@ repeat:
                         page_cache_release(swappage);
                         goto repeat;
                 }
-                if (!PageSwapCache(swappage)) {
-                        /* Page migration has occured */
-                        shmem_swp_unmap(entry);
-                        spin_unlock(&info->lock);
-                        unlock_page(swappage);
-                        page_cache_release(swappage);
-                        goto repeat;
-                }
                 if (PageWriteback(swappage)) {
                         shmem_swp_unmap(entry);
                         spin_unlock(&info->lock);
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);
 
                 /*