aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Moola (Oracle) <[email protected]>2022-11-17 23:30:54 -0800
committerAndrew Morton <[email protected]>2022-11-30 15:59:02 -0800
commitac5efa782041670b63a05c36d92d02a80e50bb63 (patch)
treef050364fe56ac3ff6da38e92ad5d1e77d1d85a67
parent64ab3195ea077eaeedc8b382939c3dc5ca56f369 (diff)
memory-failure: convert truncate_error_page() to use folio
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/[email protected] Signed-off-by: Vishal Moola (Oracle) <[email protected]> Acked-by: Naoya Horiguchi <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Theodore Ts'o <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
-rw-r--r--mm/memory-failure.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 63d8501001c6..2e62940c7bae 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -840,12 +840,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;