Commit 7adb4588 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: memory-failure: kill soft_offline_free_page() 

Open-code the page_handle_poison() into soft_offline_page() and kill
unneeded soft_offline_free_page().

Link: https://lkml.kernel.org/r/20220819033402.156519-1-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 33febb51

mm/memory-failure.c

+1 −11
Original line number Diff line number Diff line
@@ -2511,16 +2511,6 @@ static int soft_offline_in_use_page(struct page *page) 
	return __soft_offline_page(page);

}



static int soft_offline_free_page(struct page *page)

{

	int rc = 0;



	if (!page_handle_poison(page, true, false))

		rc = -EBUSY;



	return rc;

}



static void put_ref_page(struct page *page)

{

	if (page)
@@ -2596,7 +2586,7 @@ int soft_offline_page(unsigned long pfn, int flags) 
	if (ret > 0) {

		ret = soft_offline_in_use_page(page);

	} else if (ret == 0) {

		if (soft_offline_free_page(page) && try_again) {

		if (!page_handle_poison(page, true, false) && try_again) {

			try_again = false;

			flags &= ~MF_COUNT_INCREASED;

			goto retry;