From patchwork Sat Mar 25 07:14:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 74833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp243827vqo; Fri, 24 Mar 2023 23:57:45 -0700 (PDT) X-Google-Smtp-Source: AKy350a/wLrs9wxXM/iYlvS0BlxwsuduxRhsNSDOnaaVZfQ2g4HEU48OjPiMvD3n+HjVHL12uy+3 X-Received: by 2002:a62:1b85:0:b0:62a:4fbd:60fe with SMTP id b127-20020a621b85000000b0062a4fbd60femr5296876pfb.12.1679727465420; Fri, 24 Mar 2023 23:57:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679727465; cv=none; d=google.com; s=arc-20160816; b=cvlS6N8EYTs9jX30Rb3zwFogzLL8zSIVkPrhWMlT7JApapyQ4mnyQACdnFHb7vKZEl vTjW0cHsiE6S4zE7+vf11RA0J8qKZo44dS1dxSCY02FkWRNL4UIVdMCcsXLuSLkUGeau FOToUF8d0uZeXkMOVx/LMhLxSBusMZxB30dZNYbsGN+ZpLN/vpTXIVu44kEugvAtCfJU Pn86fT9swNFVZJS+Xy6NLn4OxUGOzEK87uD3A2Naa0vQHnDYMkgLNqP7vlvWF9gEtpTe rKxoo/Wsxo0C5sPMFwxsEQlMIRhMrUpjjvChyLIedNNTTBvQYG/ZIyqFN8PWgWq0WF3V Mr1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=URgX+Q5L1x4pDLOmz0xPXrHJ48HPro6M5y2A0Xr3JOQ=; b=XUHi7+JnVt7GOfRocIlfbllJmpLyh5VnItYSwGU2Uv998GsPI5b1fCh1eGsoUpH5Tq OUZ0luB1DI0LEJjj+3H0Nv807/JaXHK8zdIJetzA7KBZXbwXcKC2DcGLHcpQZmmOimEB TfLcDy9lMF2BW/jUkC5yuXHAayABTY4keANZIxBF5OqvxtOOdtxUqYsSFVq9lCZaWZbn 48h/sx+ByTPpQbHb2GkIm4/Sc76+oZviarm/gld/hXGho6DhOI0aZFDdyxUoiagoQ/pU 1LTn7zyc6nn8pfH02ICXs6YmNsNvESwBRW7eB9xjFpXtSy07iGE6JgXPLCxYORA+Z8/H tZGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v63-20020a638942000000b0050bef4fcb58si23427199pgd.320.2023.03.24.23.57.33; Fri, 24 Mar 2023 23:57:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232130AbjCYGYe (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjCYGYa (ORCPT ); Sat, 25 Mar 2023 02:24:30 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5648415173 for ; Fri, 24 Mar 2023 23:24:25 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pk88j12lTzSncZ; Sat, 25 Mar 2023 14:20:53 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sat, 25 Mar 2023 14:24:22 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v7 1/4] mm/zswap: remove zswap_entry_cache_{create,destroy} helper function Date: Sat, 25 Mar 2023 15:14:17 +0800 Message-ID: <20230325071420.2246461-2-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230325071420.2246461-1-liushixin2@huawei.com> References: <20230325071420.2246461-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761321906495920358?= X-GMAIL-MSGID: =?utf-8?q?1761321906495920358?= Remove zswap_entry_cache_create and zswap_entry_cache_destroy and use kmem_cache_* function directly. Signed-off-by: Liu Shixin Reviewed-by: Christoph Hellwig --- mm/zswap.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 2f0ebd8bc620..6d2b879f091e 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -272,17 +272,6 @@ static void zswap_update_total_size(void) **********************************/ static struct kmem_cache *zswap_entry_cache; -static int __init zswap_entry_cache_create(void) -{ - zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); - return zswap_entry_cache == NULL; -} - -static void __init zswap_entry_cache_destroy(void) -{ - kmem_cache_destroy(zswap_entry_cache); -} - static struct zswap_entry *zswap_entry_cache_alloc(gfp_t gfp) { struct zswap_entry *entry; @@ -1489,7 +1478,8 @@ static int __init init_zswap(void) zswap_init_started = true; - if (zswap_entry_cache_create()) { + zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); + if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); goto cache_fail; } @@ -1538,7 +1528,7 @@ static int __init init_zswap(void) hp_fail: cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE); dstmem_fail: - zswap_entry_cache_destroy(); + kmem_cache_destroy(zswap_entry_cache); cache_fail: /* if built-in, we aren't unloaded on failure; don't allow use */ zswap_init_failed = true;