From 2c15b41d3af02184b3b61ac7143981162221d078 Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Tue, 22 Jun 2021 10:14:23 +0800 Subject: [PATCH 2928/2944] mm, thp: correct the order of unregister shrinker in error path fix #34670772 The commit 62f8852885cc ("mm, thp: introduce thp zero subpages reclaim") introduces this fat-finger defect. The fix is straightforward. Meanwhile this patch fixes a typo in comment. Acked-by: Xu Yu Reviewed-by: Ning Zhang Signed-off-by: Zheng Liu --- mm/huge_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a6f36bb..b9c8c44 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -519,11 +519,11 @@ static int __init hugepage_init(void) return 0; err_khugepaged: - unregister_shrinker(&deferred_split_shrinker); #ifdef CONFIG_MEMCG -err_hugepage_reclaim: unregister_shrinker(&hugepage_reclaim_shrinker); +err_hugepage_reclaim: #endif + unregister_shrinker(&deferred_split_shrinker); err_split_shrinker: unregister_shrinker(&huge_zero_page_shrinker); err_hzp_shrinker: @@ -3389,7 +3389,7 @@ static unsigned long hugepage_reclaim_count(struct shrinker *shrink, #define ZSR_IF_HAVE_PG_HWPOISON(flag) 0 #endif -/* Fiter unsupported page flags. */ +/* Filter unsupported page flags. */ #define PAGE_FLAG_CHECK_AT_ZERO_SUBPAGE_RECLAIM \ ((1UL << PG_error) | \ (1UL << PG_owner_priv_1) | \ -- 1.8.3.1