From patchwork Tue Nov 22 13:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_B=C3=B6hmwalder?= X-Patchwork-Id: 24383 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2207190wrr; Tue, 22 Nov 2022 05:46:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf7/qzf7pfKJ3GDT0smo5QNnv97tdyOt9KiQoAy0dNgw6BFmCz2gcOD6HhSfbmzJwO91jQAq X-Received: by 2002:a17:90a:8c82:b0:218:77d2:8c30 with SMTP id b2-20020a17090a8c8200b0021877d28c30mr24106346pjo.226.1669124804460; Tue, 22 Nov 2022 05:46:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669124804; cv=none; d=google.com; s=arc-20160816; b=GKd8JRVb7aeIGHjL5P8O6ezll5SnbWi9TDAg5/ZVI/EHhYBRSMIRn8tc3bGEAEtqCy S/1oVHhk7cxVV/nX8T9xuK9KkKgbesakPbtf3wn69Tld6mWjLqMV/b5oXX6/fT89126J EKHhaNwnofny8JKKN7RBFtL1B437DnVkjQlG3TANx2ROdTzRMTwjQ0zLFb6tUfWkwEVD njNL2gJUAeq5cpZVGPC+NB78Ydw6xke13YLqt+i0ukZWoMNZFqhQEtXKuoZ4r6Aso9CT AkU2wBmb2SwrBCLgFIKyxB3mgsQ4gPxJcfPWPW0J4t07OdmsvBVoPfilqpn96m4M+/J1 +jng== 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 :dkim-signature; bh=k1O6z3OtGyvGFc8IxR2waGYqFO7J9VHH5n+UUZvrXHw=; b=docUuqhoKWno1wuozHPEz6s+5+rDfw3IdLbWJe1TwqS/TuHXygXygmOAD2gzIBwaQS YDsHrsoa41VZSgE3rSCRD5oLS9AgK/j812aoTdsxqnpFsu17LYvDO3T0dITmMjSHOkeY 64SKZroFyrimAna23nkAFJnsdQSYj1XyH90wmtVf9BAlr73LntouIuxRR8HG2zgnLNEO V/DMXeG/VXKZSOxeWPmJPofQDn7VpvWLvSwq1z175iS4h20vBDwZhRA5aszCg7LcfCOy MF6V77eDRooh/GclYQYQQ0FVq3jsJGwKGPJxL103Qz5ApJTAFXh1a2BT74volUtskyol 3uTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b="IPQyJQu/"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w65-20020a628244000000b005383ec972b3si266391pfd.72.2022.11.22.05.46.31; Tue, 22 Nov 2022 05:46:44 -0800 (PST) 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; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b="IPQyJQu/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233767AbiKVNnb (ORCPT + 99 others); Tue, 22 Nov 2022 08:43:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233539AbiKVNnT (ORCPT ); Tue, 22 Nov 2022 08:43:19 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA23159FFA for ; Tue, 22 Nov 2022 05:43:17 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id h189-20020a1c21c6000000b003d0283bf132so874686wmh.4 for ; Tue, 22 Nov 2022 05:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k1O6z3OtGyvGFc8IxR2waGYqFO7J9VHH5n+UUZvrXHw=; b=IPQyJQu/JEjhmS86Qo8TbZjSpbF6g1sTxxROaP2IhpxAC6wpyOsuqMWQtZBHKbo7aT 6leIymPt9zIit3QkqE4vWoo7RsnJwSKacIdkWRQKALP2y3K6zBF3J4HsK4qdMAodPQq1 gMrVrxjm9kfP8+yC0rOdokLnGjcGm+RidCuGFAWvvZKKCgDMINHdYsQCRYDjYQgpjYeU voYcxN6tpasEA0889QrH/+nxE9YvNDxgJoMEt/VBWZNCXeIcnlOjBVP0/lBz26FEN4qG onP5PjrlpUXmkF5kVMNQ8C026DhYZEkthK5rbhwh7lBh78wdxDhcWXFXSJaIdUSlrzcl IOig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k1O6z3OtGyvGFc8IxR2waGYqFO7J9VHH5n+UUZvrXHw=; b=TkNoKRhEtK3vVEOYGCU2PNH8gneqUIW5CCl6QNI/I2DFW9oQlxiPqDM2iVOD8gntSZ y1VZH7LL1sd5lFDrGHyM4DoH3fuXAsCgIjx4gi7zR2wK5lgTaPcTjNEQeVroOfXAex/o Obmlj3ORTm6GWHmNGNvIJG+W3Vuc56hd78TbkmDCfbdb/vjVcRAsNs339uWWS3FJhBR5 qKvj2Jqx7cDKiw12lSeUXUFNbIeISm0z+3ksbadN68lAoqmzL7bgI/WAokoUN2Ngthp0 NoVfDjuL255/Dofs0X4hFXMkYKWYVWWm0XvRvD3rZfM6+EcAzssZw5XR8/UYq6Clau0V D9gA== X-Gm-Message-State: ANoB5pmDHzcNWsrsc4lhjDLlW3LR+wB7EGIBscI5c5944ewvRBzWGipj fHOlxFPwcVB9QApC3snKOw+VsA== X-Received: by 2002:a05:600c:4fc4:b0:3c6:c109:2d9 with SMTP id o4-20020a05600c4fc400b003c6c10902d9mr6451363wmq.149.1669124596402; Tue, 22 Nov 2022 05:43:16 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id p6-20020a1c5446000000b003b47e75b401sm21437729wmi.37.2022.11.22.05.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 05:43:14 -0800 (PST) From: =?utf-8?q?Christoph_B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, Joel Colledge , =?utf-8?q?Christoph_B=C3=B6hmwald?= =?utf-8?q?er?= Subject: [PATCH 3/4] lru_cache: remove unused lc_private, lc_set, lc_index_of Date: Tue, 22 Nov 2022 14:43:00 +0100 Message-Id: <20221122134301.69258-4-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221122134301.69258-1-christoph.boehmwalder@linbit.com> References: <20221122134301.69258-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1750204210990536030?= X-GMAIL-MSGID: =?utf-8?q?1750204210990536030?= From: Joel Colledge Signed-off-by: Joel Colledge Signed-off-by: Christoph Böhmwalder --- include/linux/lru_cache.h | 3 --- lib/lru_cache.c | 44 --------------------------------------- 2 files changed, 47 deletions(-) diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h index 07add7882a5d..c9afcdd9324c 100644 --- a/include/linux/lru_cache.h +++ b/include/linux/lru_cache.h @@ -199,7 +199,6 @@ struct lru_cache { unsigned long flags; - void *lc_private; const char *name; /* nr_elements there */ @@ -241,7 +240,6 @@ extern struct lru_cache *lc_create(const char *name, struct kmem_cache *cache, unsigned e_count, size_t e_size, size_t e_off); extern void lc_reset(struct lru_cache *lc); extern void lc_destroy(struct lru_cache *lc); -extern void lc_set(struct lru_cache *lc, unsigned int enr, int index); extern void lc_del(struct lru_cache *lc, struct lc_element *element); extern struct lc_element *lc_get_cumulative(struct lru_cache *lc, unsigned int enr); @@ -297,6 +295,5 @@ extern bool lc_is_used(struct lru_cache *lc, unsigned int enr); container_of(ptr, type, member) extern struct lc_element *lc_element_by_index(struct lru_cache *lc, unsigned i); -extern unsigned int lc_index_of(struct lru_cache *lc, struct lc_element *e); #endif diff --git a/lib/lru_cache.c b/lib/lru_cache.c index 5dd5e4c00a23..b3d9187611de 100644 --- a/lib/lru_cache.c +++ b/lib/lru_cache.c @@ -574,48 +574,6 @@ struct lc_element *lc_element_by_index(struct lru_cache *lc, unsigned i) return lc->lc_element[i]; } -/** - * lc_index_of - * @lc: the lru cache to operate on - * @e: the element to query for its index position in lc->element - */ -unsigned int lc_index_of(struct lru_cache *lc, struct lc_element *e) -{ - PARANOIA_LC_ELEMENT(lc, e); - return e->lc_index; -} - -/** - * lc_set - associate index with label - * @lc: the lru cache to operate on - * @enr: the label to set - * @index: the element index to associate label with. - * - * Used to initialize the active set to some previously recorded state. - */ -void lc_set(struct lru_cache *lc, unsigned int enr, int index) -{ - struct lc_element *e; - struct list_head *lh; - - if (index < 0 || index >= lc->nr_elements) - return; - - e = lc_element_by_index(lc, index); - BUG_ON(e->lc_number != e->lc_new_number); - BUG_ON(e->refcnt != 0); - - e->lc_number = e->lc_new_number = enr; - hlist_del_init(&e->colision); - if (enr == LC_FREE) - lh = &lc->free; - else { - hlist_add_head(&e->colision, lc_hash_slot(lc, enr)); - lh = &lc->lru; - } - list_move(&e->list, lh); -} - /** * lc_seq_dump_details - Dump a complete LRU cache to seq in textual form. * @lc: the lru cache to operate on @@ -650,7 +608,6 @@ void lc_seq_dump_details(struct seq_file *seq, struct lru_cache *lc, char *utext EXPORT_SYMBOL(lc_create); EXPORT_SYMBOL(lc_reset); EXPORT_SYMBOL(lc_destroy); -EXPORT_SYMBOL(lc_set); EXPORT_SYMBOL(lc_del); EXPORT_SYMBOL(lc_try_get); EXPORT_SYMBOL(lc_find); @@ -658,7 +615,6 @@ EXPORT_SYMBOL(lc_get); EXPORT_SYMBOL(lc_put); EXPORT_SYMBOL(lc_committed); EXPORT_SYMBOL(lc_element_by_index); -EXPORT_SYMBOL(lc_index_of); EXPORT_SYMBOL(lc_seq_printf_stats); EXPORT_SYMBOL(lc_seq_dump_details); EXPORT_SYMBOL(lc_try_lock);