mm, memory_hotplug: fix MMOP_ONLINE_KEEP behavior

[mirror_ubuntu-artful-kernel.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 9100c4952698ff1ba3becabf77a6309f1dfcbb4a..a06f23731d3f96db3a2b134d0d62b3c78dcef00c 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1291,7 +1291,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
                SetPageUptodate(page);
        }
 
-       swap = get_swap_page();
+       swap = get_swap_page(page);
        if (!swap.val)
                goto redirty;
 
@@ -1327,7 +1327,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
 
        mutex_unlock(&shmem_swaplist_mutex);
 free_swap:
-       swapcache_free(swap);
+       put_swap_page(page, swap);
 redirty:
        set_page_dirty(page);
        if (wbc->for_reclaim)