| Message ID | 20240229212036.2160900-9-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Some cleanups for memory-failure | expand |
On 2024/3/1 5:20, Matthew Wilcox (Oracle) wrote: > Some of these folio APIs didn't exist when the unpoison_memory() > conversion was done originally. > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> LGTM. Thanks. Acked-by: Miaohe Lin <linmiaohe@huawei.com> > --- > mm/memory-failure.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 56bc83372e30..0806edb48b61 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -2556,8 +2556,8 @@ int unpoison_memory(unsigned long pfn) > goto unlock_mutex; > } > > - if (folio_test_slab(folio) || PageTable(&folio->page) || > - folio_test_reserved(folio) || PageOffline(&folio->page)) > + if (folio_test_slab(folio) || folio_test_pgtable(folio) || > + folio_test_reserved(folio) || folio_test_offline(folio)) > goto unlock_mutex; > > /* > @@ -2578,7 +2578,7 @@ int unpoison_memory(unsigned long pfn) > > ghp = get_hwpoison_page(p, MF_UNPOISON); > if (!ghp) { > - if (PageHuge(p)) { > + if (folio_test_hugetlb(folio)) { > huge = true; > count = folio_free_raw_hwp(folio, false); > if (count == 0) > @@ -2594,7 +2594,7 @@ int unpoison_memory(unsigned long pfn) > pfn, &unpoison_rs); > } > } else { > - if (PageHuge(p)) { > + if (folio_test_hugetlb(folio)) { > huge = true; > count = folio_free_raw_hwp(folio, false); > if (count == 0) { >
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 56bc83372e30..0806edb48b61 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2556,8 +2556,8 @@ int unpoison_memory(unsigned long pfn) goto unlock_mutex; } - if (folio_test_slab(folio) || PageTable(&folio->page) || - folio_test_reserved(folio) || PageOffline(&folio->page)) + if (folio_test_slab(folio) || folio_test_pgtable(folio) || + folio_test_reserved(folio) || folio_test_offline(folio)) goto unlock_mutex; /* @@ -2578,7 +2578,7 @@ int unpoison_memory(unsigned long pfn) ghp = get_hwpoison_page(p, MF_UNPOISON); if (!ghp) { - if (PageHuge(p)) { + if (folio_test_hugetlb(folio)) { huge = true; count = folio_free_raw_hwp(folio, false); if (count == 0) @@ -2594,7 +2594,7 @@ int unpoison_memory(unsigned long pfn) pfn, &unpoison_rs); } } else { - if (PageHuge(p)) { + if (folio_test_hugetlb(folio)) { huge = true; count = folio_free_raw_hwp(folio, false); if (count == 0) {
Some of these folio APIs didn't exist when the unpoison_memory() conversion was done originally. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/memory-failure.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)