1 files changed, 9 insertions, 10 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 054250ee4a68..7bd22a621817 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2994,17 +2994,16 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
         if (unlikely(!PageSwapCache(page) || page_private(page) != entry.val))
                 goto out_page;
 
-        if (ksm_might_need_to_copy(page, vma, address)) {
-                swapcache = page;
-                page = ksm_does_need_to_copy(page, vma, address);
-
-                if (unlikely(!page)) {
-                        ret = VM_FAULT_OOM;
-                        page = swapcache;
-                        swapcache = NULL;
-                        goto out_page;
-                }
+        swapcache = page;
+        page = ksm_might_need_to_copy(page, vma, address);
+        if (unlikely(!page)) {
+                ret = VM_FAULT_OOM;
+                page = swapcache;
+                swapcache = NULL;
+                goto out_page;
         }
+        if (page == swapcache)
+                swapcache = NULL;
 
         if (mem_cgroup_try_charge_swapin(mm, page, GFP_KERNEL, &ptr)) {
                 ret = VM_FAULT_OOM;