mm: return a folio from read_swap_cache_async()

[linux-2.6-block.git] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index d2fe70e307d94b312f616bbb5dd041456fa7ce51..97c8a950dd1814ced790cd0075f14a637f34ca30 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -533,9 +533,9 @@ fail_put_swap:
  * __read_swap_cache_async() call them and swap_read_folio() holds the
  * swap cache folio lock.
  */
-struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
-                                  struct vm_area_struct *vma,
-                                  unsigned long addr, struct swap_iocb **plug)
+struct folio *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
+               struct vm_area_struct *vma, unsigned long addr,
+               struct swap_iocb **plug)
 {
        bool page_allocated;
        struct mempolicy *mpol;
@@ -549,7 +549,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
 
        if (page_allocated)
                swap_read_folio(folio, false, plug);
-       return folio_file_page(folio, swp_offset(entry));
+       return folio;
 }
 
 static unsigned int __swapin_nr_pages(unsigned long prev_offset,