Commit 183a7c5d authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: memory-failure: avoid pfn_valid() twice in soft_offline_page() 

Simplify WARN_ON_ONCE(flags & MF_COUNT_INCREASED) under !pfn_valid().

Link: https://lkml.kernel.org/r/20221021084611.53765-2-wangkefeng.wang@huawei.com


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

mm/memory-failure.c

+3 −3
Original line number Diff line number Diff line
@@ -2551,10 +2551,10 @@ int soft_offline_page(unsigned long pfn, int flags) 
	bool try_again = true;

	struct page *page;



	WARN_ON_ONCE(!pfn_valid(pfn) && (flags & MF_COUNT_INCREASED));



	if (!pfn_valid(pfn))

	if (!pfn_valid(pfn)) {

		WARN_ON_ONCE(flags & MF_COUNT_INCREASED);

		return -ENXIO;

	}



	/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */

	page = pfn_to_online_page(pfn);