mm: Convert swap_readpage to call read_folio instead of readpage

This commit is split out so it can be dropped when resolving
conflicts with Neil Brown's series to stop calling ->readpage in
the swap code.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/mm/page_io.c b/mm/page_io.c
index 89fbf3cae30f7cf58a0a1b83970ed8b17d627507..1ae4be14f9d3f7529c7660516151986a483f5909 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -336,7 +336,7 @@ int swap_readpage(struct page *page, bool synchronous)
                struct file *swap_file = sis->swap_file;
                struct address_space *mapping = swap_file->f_mapping;
 
-               ret = mapping->a_ops->readpage(swap_file, page);
+               ret = mapping->a_ops->read_folio(swap_file, page_folio(page));
                if (!ret)
                        count_vm_event(PSWPIN);
                goto out;