mm: memory-failure: kill soft_offline_free_page()

[ Upstream commit 7adb45887c8af88985c335b53d253654e9d2dd16 ]

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: e2c1ab070fdc ("mm: memory-failure: fix unexpected return value in soft_offline_page()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index e3c0fa2464ff8d7ee70c79a861aad4a6c39e6d96..6375fe9be87b6399b5da80260d43dfb1ee042a37 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1857,16 +1857,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)
@@ -1929,7 +1919,7 @@ retry:
        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;