1 files changed, 2 insertions, 2 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 048a95a5244d..91ce9a1024d7 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1081,7 +1081,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
         shmem_recalc_inode(inode);
 
         if (swap.val && add_to_swap_cache(page, swap, GFP_ATOMIC) == 0) {
-                remove_from_page_cache(page);
+                delete_from_page_cache(page);
                 shmem_swp_set(info, entry, swap.val);
                 shmem_swp_unmap(entry);
                 if (list_empty(&info->swaplist))
@@ -1091,7 +1091,6 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
                 spin_unlock(&info->lock);
                 swap_shmem_alloc(swap);
                 BUG_ON(page_mapped(page));
-                page_cache_release(page);       /* pagecache ref */
                 swap_writepage(page, wbc);
                 if (inode) {
                         mutex_lock(&shmem_swaplist_mutex);
@@ -2794,5 +2793,6 @@ int shmem_zero_setup(struct vm_area_struct *vma)
                 fput(vma->vm_file);
         vma->vm_file = file;
         vma->vm_ops = &shmem_vm_ops;
+        vma->vm_flags |= VM_CAN_NONLINEAR;
         return 0;
 }