From patchwork Tue Jul 11 03:54:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13308099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAD4AEB64DC for ; Tue, 11 Jul 2023 03:55:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7ECD08E000A; Mon, 10 Jul 2023 23:55:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 79CAE8E0002; Mon, 10 Jul 2023 23:55:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63D6E8E000A; Mon, 10 Jul 2023 23:55:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 57E6E8E0002 for ; Mon, 10 Jul 2023 23:55:25 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2135AAFE3F for ; Tue, 11 Jul 2023 03:55:25 +0000 (UTC) X-FDA: 80997966210.14.8A0CA49 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf25.hostedemail.com (Postfix) with ESMTP id 2991EA0004 for ; Tue, 11 Jul 2023 03:55:22 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=FG0CUQd2; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689047723; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9OtSvFihiDnLwRXPS16aFXYvoQJZK7qgLbCrmPMdkz4=; b=01DxzP/OiGUrJvxbbjxZuUa/xHpVG0MilYzGfb56pIJslLkDnVVKMIDkxWyjrOynf4VZXk a/zyr4pBuDmTIkHmIoE4xlMEZMFCBoTUTGfH6a1W87DFpx33Qo+LvsaBP5LxphrhbK9P6Q +Y8o/k4bk6eBQejn3saE+y0f20SJq2I= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=FG0CUQd2; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689047723; a=rsa-sha256; cv=none; b=Nz59CC23IwOfQB8AeQ8l0LI69oNLkXWBoqMtjyCFmbsC/TaFsyooDM+U5j4SnUKcwhfpO6 li4BTRBOnw4ZSLHY/orazzWUfinTiWEpM8LmFfuor7iM0ZKemKwYA9unLwSzV4FO3BcXPE 6BM4fEXnbat6C+esnSnbFnt3jURGED8= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b8bd586086so39283255ad.2 for ; Mon, 10 Jul 2023 20:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1689047722; x=1691639722; 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=9OtSvFihiDnLwRXPS16aFXYvoQJZK7qgLbCrmPMdkz4=; b=FG0CUQd2LZZyzjMyMvHehaF916WG7DrINm7YYqYYtJ5WS2xrMsL6v25DynuNojHGcY wxJHLbsZd3VzymebJe3AbpxVxh8p92JQt1W7oYL6JGZPHChw5F2mpgzCFQjPgG/pRgrG R9SdhrLWfRfpui4ajHnLe7B+Ce7DB6fG7EHTKc6H4b6krsWfzkslA3A6kJ65n57EMi67 r7wGoSifkbrij6l+nuuX6+RLAvIa2M1VBQhNUZmrtD8uC9zIzrLOoK3lLbRmmWWH00zi F5dCS62bKbff4y7LupnA6PVUNnnxTM6u1aOsADrPYPfQ8pjREh97a5YCVgY0pq0yCm7r /dzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689047722; x=1691639722; 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=9OtSvFihiDnLwRXPS16aFXYvoQJZK7qgLbCrmPMdkz4=; b=BVriuLGK31rOo+7nKRWF6pWHk+hqvk031VD2VUntJpPTAqMV0/XaTQNUg7+do5P1GE IbQIBlB24v0xSV2byojW+kZGxXGKk5cR1UTIS2ykohZUlPyYbMdF69XSzsmBd+ZCjBTK R6f8GiMIw4b4060cXlhvhiq6wG8pbAWuNOKn7uUswp3z1mBONYGdulPeAO58ZguOYHbt QlleEsbrK8gsQmyp3c+Pej4DJ8YicFy8WRZoJwM9sqIIDtgNJsR7aUUaDslKq4Mw4eii SuC8RiHlSpK/RZkJViKxEvlafC10pgmv6EF+NSEe/xL71sUF38vqalPgJ8fxph5TBVXA ULWA== X-Gm-Message-State: ABy/qLbwrGdxOUmeOJyWOnX5do/TzqHTOP4yXgG0PbK46eSFu6SiUkvD E31j8ScP0N56Z0QChcu6N38inw== X-Google-Smtp-Source: APBJJlEH9ks+ldoqWiak1C46jFp9K+PHzKkaAAEHH5o80WCKWCeDBoMcB9O6Ge8DSYjubjyST3RT1w== X-Received: by 2002:a17:902:ecc2:b0:1b9:d439:c009 with SMTP id a2-20020a170902ecc200b001b9d439c009mr10667995plh.57.1689047722210; Mon, 10 Jul 2023 20:55:22 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id b15-20020a170903228f00b001b872c17535sm688329plh.13.2023.07.10.20.55.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Jul 2023 20:55:22 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v2 8/8] maple_tree: drop mas_first_entry() Date: Tue, 11 Jul 2023 11:54:44 +0800 Message-Id: <20230711035444.526-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230711035444.526-1-zhangpeng.00@bytedance.com> References: <20230711035444.526-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2991EA0004 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: rf3mpqd7pn389jcoj354k7gh47n6ok7y X-HE-Tag: 1689047722-107624 X-HE-Meta: U2FsdGVkX1+l5LyUmbcyvmQHtlqAmTTjdZwgr2cAaxigjN1u/2lbltjrmhSJF0vq4MW3TBppLgyD27IeIKiGt3qkknmlIo640wSf7fFuZuHtFLeZT9g2MKL3QzZTKSiEM5uv5wbhmXOBEq8dXzjwcITQwfSGLbLWqyfaJn+8CrgphvkodbTY8nvig09AVL3biWk8nziQAAOcgH0IzoWHHiPQpGv208SzlOo751YCf+amJaYATpWXkFb+yZzKRhejbPe9uhf6MGqpMtni1NNAzDiznUqR1eZOIGtFEUMEMwdzCzcPSjuWbB7r8OqKlnH/GUZjnMyS9eh0TaLAdO829YAz/moX82syG0zXA+BD6x/M8NsBlXBNAaxf7BoPtrTa1n1SbD8RcTBujBpSe0pfQZ88AdDrrVffCpzMSmuiqyUsvMYDLp263YhAkUSbWhcHvcIzpkDxB8wGZVqUf951kbD4i/dTA3MKroIDwaLQ7sXlmXkWCzrzpTXSEOIo8IkJd2sWV31RDBi8kCCs7/L3xSffPzMKzLF8M1Y1iJ9VOpJMNIy7BJtw1Ktvzc6Mh9vZxwvMJa0p5fH7oV61QJ7M0F6hW7Q5cpOQg0KqD8QEDCtwe5viG1BUT5i37s9j378HQHW4c0Sx8Q6yI/YvDil/vzEAnfqDdW/gfOZPYoKrvG9CmS3nLlcSKuZv+Om/HcnPO19OHOrs8RQc7euS2/9Aoi1Eey6cAFoZhOicxXZjREeNG4kIzlLzafdPIr3tyUOnU4l52qfg9GG6VQXHTnP/FTRsevzc1faGWkoN5t4unYfWV2jzAH4HbYdkWlpD2fRjP6sH9Mq7VcY6iEhQbbEyTVLpoZAfrnwAEWnf9jgFeqTiI3WJxID1dk0jihiWzTv2F34RtVt5Rjzyfk0LXp/MPlqQnHxYU54y6IG1fn9Ux095GQsCcwmrionPVX0xOELbvYWNPYJRlrhPcqKPPwB Dw242nhQ 3Wpkv8mMBLEhr+2ElQx85uFGNdz9A0eA1bR79I+Yf645Zjh8e3ncLME54G9PPFdJTz+g60hDgTEa2fgCxrL/3HFE7LKmWW5MX6L5b3c5CyWySwXceE9xdfcIZAqu284uty1eGmiMYBzzWJh4yBlRFe0wzOyiiTP4x9md7iASs9uiWwueo/PXaAM5aMLpJdLiRup1S02fapyo1ogBq4XEUp31gvcgPETfkq7ExFBhGXp61Mo5bkcZZdH5/GGKpaZExgSUPZG2GZoxNGacSWi6Ri7yz2ChDxIUjstNi2fvLSKIiWsU8ji4sjiWGDz8XjtMd8MkXLIFg/EIoSvrE069dQqv6H3Mxr66SYuMo/Ve3FrrIAAm9/IBoUYvs9owSj5xdqWy0CmAezVdOzVf6irFYwUsPGz7+9DXnJxfcEKDOHNHbAqkux776Y7AB+1chE5c42Xc3FA8fJlIgFOxoOKvEPdhP2VNhdRiSPDC+S6H/YIarwZs= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The internal function mas_first_entry() is no longer used, so drop it. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 72 ------------------------------------------------ 1 file changed, 72 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 5eb5eede2727..bd4557eeb42c 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6662,78 +6662,6 @@ static inline struct maple_enode *mas_get_slot(struct ma_state *mas, offset); } - -/* - * mas_first_entry() - Go the first leaf and find the first entry. - * @mas: the maple state. - * @limit: the maximum index to check. - * @*r_start: Pointer to set to the range start. - * - * Sets mas->offset to the offset of the entry, r_start to the range minimum. - * - * Return: The first entry or MAS_NONE. - */ -static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn, - unsigned long limit, enum maple_type mt) - -{ - unsigned long max; - unsigned long *pivots; - void __rcu **slots; - void *entry = NULL; - - mas->index = mas->min; - if (mas->index > limit) - goto none; - - max = mas->max; - mas->offset = 0; - while (likely(!ma_is_leaf(mt))) { - MAS_WARN_ON(mas, mte_dead_node(mas->node)); - slots = ma_slots(mn, mt); - entry = mas_slot(mas, slots, 0); - pivots = ma_pivots(mn, mt); - if (unlikely(ma_dead_node(mn))) - return NULL; - max = pivots[0]; - mas->node = entry; - mn = mas_mn(mas); - mt = mte_node_type(mas->node); - } - MAS_WARN_ON(mas, mte_dead_node(mas->node)); - - mas->max = max; - slots = ma_slots(mn, mt); - entry = mas_slot(mas, slots, 0); - if (unlikely(ma_dead_node(mn))) - return NULL; - - /* Slot 0 or 1 must be set */ - if (mas->index > limit) - goto none; - - if (likely(entry)) - return entry; - - mas->offset = 1; - entry = mas_slot(mas, slots, 1); - pivots = ma_pivots(mn, mt); - if (unlikely(ma_dead_node(mn))) - return NULL; - - mas->index = pivots[0] + 1; - if (mas->index > limit) - goto none; - - if (likely(entry)) - return entry; - -none: - if (likely(!ma_dead_node(mn))) - mas->node = MAS_NONE; - return NULL; -} - /* Depth first search, post-order */ static void mas_dfs_postorder(struct ma_state *mas, unsigned long max) {