From patchwork Mon Apr 3 12:13:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 78508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2226462vqo; Mon, 3 Apr 2023 04:27:26 -0700 (PDT) X-Google-Smtp-Source: AKy350aUYliwVztNzQ8893wa4gRQLo84b5+EpPJT6QvwPdazOrhHsZE51Qn9r9eRdrFAN6dr2bBd X-Received: by 2002:a17:903:41c1:b0:19a:839f:435 with SMTP id u1-20020a17090341c100b0019a839f0435mr19967833ple.3.1680521246467; Mon, 03 Apr 2023 04:27:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680521246; cv=none; d=google.com; s=arc-20160816; b=donkNlngAr1u3JTXwl172eaP+rnnWyt3NSN6v7ZfuqvyE07rCq6UTIhwp3tnkBVu/I GAtw1JsYrw0V0+vUCRBV7woUWVuWCGizQj3i8YBc9oylKFFe/gYOJdAOKVSutN6IbAcS HWWJgXVUS8FQEWJ1c+aoq3EGebDKXAcArJ9TIGRVtU+bn2/faxGrJQBaGQ4WLs34Ahmp kqukqiU+WbahJ6D/KU5VuwN5MTtRLPC4GtwdvmzKkDGWTmN9AEkJuunSupqJe1ft3/Wg JztYT7IFYyHhP9H9OdqyDY8Yghk+nowFvcchCsCKC0/oEkfwwIunqaFluSoTUK3wwJfv zO4g== 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=pyRVNsPQ4Sx+6WBC8hND2yn7BWvh9ajOEezmjcyJiUatN2akDeqBk9NXasx3fHeGkX eQ1YEFGJMcLpI74MT/EWBUMq1vPgaiQqSG5VIuKb2kx9H1PbG97B7qNXq7wJCwcCjrRf Mv0uKeT6lMB/v8VCmWrCm1kYIjnYfjQTZUDqkaUboLIvuuWS55Ab9yKTM7DjrEFmi6f7 zywhtEu3Mi/Y8Bpx8P+WVpT8LuKebH8z8pfUrTEnsPsQTMjwfIqXG9/QzpHHGQhWkbUG cTITOG0OMumLESNt9HM+t2zrPMDTtUfWB3UyzjTeizCObh8m07qj2xnotxEXjpghOUKF 9JyQ== 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 b15-20020a17090a488f00b0023cfd288a09si7440668pjh.157.2023.04.03.04.27.14; Mon, 03 Apr 2023 04:27:26 -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 S231649AbjDCLXW (ORCPT + 99 others); Mon, 3 Apr 2023 07:23:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjDCLXU (ORCPT ); Mon, 3 Apr 2023 07:23:20 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE51A40DB for ; Mon, 3 Apr 2023 04:23:18 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PqpM90v61zSqnD; Mon, 3 Apr 2023 19:19:33 +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; Mon, 3 Apr 2023 19:23:15 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v8 1/3] mm/zswap: remove zswap_entry_cache_{create,destroy} helper function Date: Mon, 3 Apr 2023 20:13:16 +0800 Message-ID: <20230403121318.1876082-2-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230403121318.1876082-1-liushixin2@huawei.com> References: <20230403121318.1876082-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?1762154246623749970?= X-GMAIL-MSGID: =?utf-8?q?1762154246623749970?= 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;