From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Fri, 29 Apr 2022 15:51:22 +0000 (-0400)
Subject: mm: Convert swap_readpage to call read_folio instead of readpage
X-Git-Tag: v5.19-rc1~169^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f312591d656c1d81bf2cf2a5642af478397a5dc;p=thirdparty%2Fkernel%2Flinux.git

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 89fbf3cae30f7..1ae4be14f9d3f 100644
--- 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;