Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index f1e69c30d203..1f9cf0d073b8 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -554,6 +554,15 @@ static int unuse_mm(struct mm_struct *mm,
         return 0;
 }
 
+#ifdef CONFIG_MIGRATION
+int remove_vma_swap(struct vm_area_struct *vma, struct page *page)
+{
+        swp_entry_t entry = { .val = page_private(page) };
+
+        return unuse_vma(vma, entry, page);
+}
+#endif
+
 /*
  * Scan swap_map from current position to next entry still in use.
  * Recycle to start on reaching the end, returning 0 when empty.
@@ -646,6 +655,7 @@ 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) {
                         /*
@@ -680,6 +690,12 @@ static int try_to_unuse(unsigned int type)
                 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);
 
                 /*