提交 183a7c5d 编写于 作者: K Kefeng Wang 提交者: Andrew Morton

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.comSigned-off-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: NNaoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: NMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
上级 b5f1fc98
...@@ -2551,10 +2551,10 @@ int soft_offline_page(unsigned long pfn, int flags) ...@@ -2551,10 +2551,10 @@ int soft_offline_page(unsigned long pfn, int flags)
bool try_again = true; bool try_again = true;
struct page *page; struct page *page;
WARN_ON_ONCE(!pfn_valid(pfn) && (flags & MF_COUNT_INCREASED)); if (!pfn_valid(pfn)) {
WARN_ON_ONCE(flags & MF_COUNT_INCREASED);
if (!pfn_valid(pfn))
return -ENXIO; return -ENXIO;
}
/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */ /* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */
page = pfn_to_online_page(pfn); page = pfn_to_online_page(pfn);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册