memory-failure: convert truncate_error_page() to use folio

[ Upstream commit ac5efa782041670b63a05c36d92d02a80e50bb63 ]

Replace try_to_release_page() with filemap_release_folio().  This change
is in preparation for the removal of the try_to_release_page() wrapper.

Link: https://lkml.kernel.org/r/20221118073055.55694-4-vishal.moola@gmail.com
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: 1898efcdbed3 ("block: update the stable_writes flag in bdev_add")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ebd717157c8134f536de64c4e0ba3a1e831363c2..6355166a6bb2807a760e4971a91be85556c349e9 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -827,12 +827,13 @@ static int truncate_error_page(struct page *p, unsigned long pfn,
        int ret = MF_FAILED;
 
        if (mapping->a_ops->error_remove_page) {
+               struct folio *folio = page_folio(p);
                int err = mapping->a_ops->error_remove_page(mapping, p);
 
                if (err != 0) {
                        pr_info("%#lx: Failed to punch page: %d\n", pfn, err);
-               } else if (page_has_private(p) &&
-                          !try_to_release_page(p, GFP_NOIO)) {
+               } else if (folio_has_private(folio) &&
+                          !filemap_release_folio(folio, GFP_NOIO)) {
                        pr_info("%#lx: failed to release buffers\n", pfn);
                } else {
                        ret = MF_RECOVERED;