Commit ac5efa78 authored by Vishal Moola (Oracle)'s avatar Vishal Moola (Oracle) Committed by Andrew Morton

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/20221118073055.55694-4-vishal.moola@gmail.comSigned-off-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 64ab3195
...@@ -840,12 +840,13 @@ static int truncate_error_page(struct page *p, unsigned long pfn, ...@@ -840,12 +840,13 @@ static int truncate_error_page(struct page *p, unsigned long pfn,
int ret = MF_FAILED; int ret = MF_FAILED;
if (mapping->a_ops->error_remove_page) { if (mapping->a_ops->error_remove_page) {
struct folio *folio = page_folio(p);
int err = mapping->a_ops->error_remove_page(mapping, p); int err = mapping->a_ops->error_remove_page(mapping, p);
if (err != 0) { if (err != 0) {
pr_info("%#lx: Failed to punch page: %d\n", pfn, err); pr_info("%#lx: Failed to punch page: %d\n", pfn, err);
} else if (page_has_private(p) && } else if (folio_has_private(folio) &&
!try_to_release_page(p, GFP_NOIO)) { !filemap_release_folio(folio, GFP_NOIO)) {
pr_info("%#lx: failed to release buffers\n", pfn); pr_info("%#lx: failed to release buffers\n", pfn);
} else { } else {
ret = MF_RECOVERED; ret = MF_RECOVERED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment