| Message ID | 20190910103016.14290-2-osalvador@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Hwpoison soft-offline rework | expand |
On 10.09.19 12:30, Oscar Salvador wrote: > From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > > memory_failure() forks to memory_failure_hugetlb() for hugetlb pages, > so a PageHuge() check after the fork should not be necessary. > > Signed-off-by: Oscar Salvador <osalvador@suse.de> > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > mm/memory-failure.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 7ef849da8278..e43b61462fd5 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -1353,10 +1353,7 @@ int memory_failure(unsigned long pfn, int flags) > * page_remove_rmap() in try_to_unmap_one(). So to determine page status > * correctly, we save a copy of the page flags at this time. > */ > - if (PageHuge(p)) > - page_flags = hpage->flags; > - else > - page_flags = p->flags; > + page_flags = p->flags; > > /* > * unpoison always clear PG_hwpoison inside page lock > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 7ef849da8278..e43b61462fd5 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1353,10 +1353,7 @@ int memory_failure(unsigned long pfn, int flags) * page_remove_rmap() in try_to_unmap_one(). So to determine page status * correctly, we save a copy of the page flags at this time. */ - if (PageHuge(p)) - page_flags = hpage->flags; - else - page_flags = p->flags; + page_flags = p->flags; /* * unpoison always clear PG_hwpoison inside page lock