From patchwork Tue Apr 11 09:36:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 81827 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2440909vqo; Tue, 11 Apr 2023 02:31:39 -0700 (PDT) X-Google-Smtp-Source: AKy350YHIMRfmIonjX3typMmZ89y0UOkBZfbHyvnR2OKCwWfqIPZY4oksOrbMyrUYkV4nL/HbnWk X-Received: by 2002:a17:906:d28a:b0:94e:17f:f466 with SMTP id ay10-20020a170906d28a00b0094e017ff466mr2455725ejb.25.1681205499570; Tue, 11 Apr 2023 02:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681205499; cv=none; d=google.com; s=arc-20160816; b=hwukUiKQE0oCqUYh16aV4vBTiYC2VxYPA719Lb8m6jN/wd+ExyWqHI2F7gN+UWxZBa jA5nZNaj5WmrS+Q+/tUbT2nrJoRetycDyfC23WPK9oYQFiJyVjICfbBuFcKCLRPdHLNV JzuSyxEF2SncRCzrfPrsSyqbzr/RQtHPS7uySPtATfBMxc1b+6Bp8ep8vXn7cr9nzf1+ qHBK4tlu901eFeHLOeDI3sEJGBfQoEz8UAslzky/zPBatfK6Bbd8ThK7HeIa0xmCBm9K ZtcrtkbZfZAc+O2NWbDfig81nM0UaStl5l4Pc5inbSCZfCHjvPpXk/0DYnlYAuNqUPCb ox2A== 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=DZ/SUniV1JtRkr7SINojZDbyN4/r+Vf3/yK5HT+Jekw=; b=BdqhqkEgGfoB1ToqKnpLzVam8SwSP3PGV/GupTVh19aR8q8ILUe0TiPuJ59Up1FlbI K7nYW4x7ycSPzhgiBg+wDwd0q3PgcjP4MuvG61n5DmZHFoR0eJiRsUh2R2mYyJvix4IM T+O4nafEV5w+SQYS0T0WnaM80XkMGAJ4WMwV5EENvQXu6/WB1hfWE5oi9lnpOFqsLbmD oK0DLavjl2ADeGs8vK2HfiArk/9PxkpGApejByX9LH2P3NeJrqK7TC80ZRdH1kwpZDa0 f/yt+o1nYJKhVk6jSZighSgRCcmDrs2/EyW+ToD857ynwZptsTOo3zR3JriyMWJTASfV +vlQ== 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 tx10-20020a1709078e8a00b0094ace599932si2810317ejc.83.2023.04.11.02.31.15; Tue, 11 Apr 2023 02:31:39 -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 S230503AbjDKIqk (ORCPT + 99 others); Tue, 11 Apr 2023 04:46:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230237AbjDKIqf (ORCPT ); Tue, 11 Apr 2023 04:46:35 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F5EDE6A for ; Tue, 11 Apr 2023 01:46:33 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PwfWx0VJRzKxn9; Tue, 11 Apr 2023 16:43:57 +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.23; Tue, 11 Apr 2023 16:46:30 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v9 1/3] mm/zswap: remove zswap_entry_cache_{create,destroy} helper function Date: Tue, 11 Apr 2023 17:36:30 +0800 Message-ID: <20230411093632.822290-2-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230411093632.822290-1-liushixin2@huawei.com> References: <20230411093632.822290-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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?1762871737776380647?= X-GMAIL-MSGID: =?utf-8?q?1762871737776380647?= 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;