shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

mm: memory-failure: kill soft_offline_free_page()

Browse Source 
[ Upstream commit 7adb45887c ]

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: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: e2c1ab070f ("mm: memory-failure: fix unexpected return value in soft_offline_page()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kefeng Wang
2022-08-19 11:34:01 +08:00
committed by Greg Kroah-Hartman
parent 406166a3ac
commit 20c2db79f1
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mm/memory-failure.c
View File

@@ -1857,16 +1857,6 @@ static int soft_offline_in_use_page(struct page *page)
return __soft_offline_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) static void put_ref_page(struct page *page)
{ {
if (page) if (page)
@@ -1929,7 +1919,7 @@ retry:
if (ret > 0) { if (ret > 0) {
ret = soft_offline_in_use_page(page); ret = soft_offline_in_use_page(page);
} else if (ret == 0) { } else if (ret == 0) {
if (soft_offline_free_page(page) && try_again) { if (!page_handle_poison(page, true, false) && try_again) {
try_again = false; try_again = false;
flags &= ~MF_COUNT_INCREASED; flags &= ~MF_COUNT_INCREASED;
goto retry; goto retry;