1 files changed, 3 insertions, 3 deletions

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 8368621a0fc7..8e7ce9a9bc5e 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -116,7 +116,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp)
         struct address_space *address_space = swap_address_space(entry);
         pgoff_t idx = swp_offset(entry);
         XA_STATE_ORDER(xas, &address_space->i_pages, idx, compound_order(page));
-        unsigned long i, nr = 1UL << compound_order(page);
+        unsigned long i, nr = compound_nr(page);
 
         VM_BUG_ON_PAGE(!PageLocked(page), page);
         VM_BUG_ON_PAGE(PageSwapCache(page), page);
@@ -133,7 +133,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp)
                 for (i = 0; i < nr; i++) {
                         VM_BUG_ON_PAGE(xas.xa_index != idx + i, page);
                         set_page_private(page + i, entry.val + i);
-                        xas_store(&xas, page + i);
+                        xas_store(&xas, page);
                         xas_next(&xas);
                 }
                 address_space->nrpages += nr;
@@ -168,7 +168,7 @@ void __delete_from_swap_cache(struct page *page, swp_entry_t entry)
 
         for (i = 0; i < nr; i++) {
                 void *entry = xas_store(&xas, NULL);
-                VM_BUG_ON_PAGE(entry != page + i, entry);
+                VM_BUG_ON_PAGE(entry != page, entry);
                 set_page_private(page + i, 0);
                 xas_next(&xas);
         }