From mboxrd@z Thu Jan 1 00:00:00 1970 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 60768EB64DB for ; Thu, 15 Jun 2023 13:11:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3B096B007B; Thu, 15 Jun 2023 09:11:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C45D8E0009; Thu, 15 Jun 2023 09:11:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83D958E0008; Thu, 15 Jun 2023 09:11:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 754276B007B for ; Thu, 15 Jun 2023 09:11:00 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 55839120850 for ; Thu, 15 Jun 2023 13:11:00 +0000 (UTC) X-FDA: 80905017480.19.FB727AC Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf22.hostedemail.com (Postfix) with ESMTP id 393D1C0021 for ; Thu, 15 Jun 2023 13:10:56 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=EF9Lkit8; spf=pass (imf22.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686834657; a=rsa-sha256; cv=none; b=YQOcsBNY3Cb09LW/iIgX73QzM5UZJesSzP60ZXGDHcVVBXPFQH+OMAqCBM6WXoGMo2d7rr Cc1JeUUKbOdA2J/UtaYW954XCe5Y2l+7HMMrNOKibtXQ5seA9l4FDwF1WGcIctFL8bbgPd T9dx2x928V3U7IWQTSLGEHKPrheYPb4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=EF9Lkit8; spf=pass (imf22.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686834657; 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=CEErg3d4yT8esB8KpwjYxwMfJsf51/geZ+6n58UDGJs=; b=MGTQiKDDBuzALgph7tHKzBwiBeQAcBJzxi5lS89NcMfGgRJOaDC5Rr/DgBhAIHGnz7BjhT yWhZ7pJgNJzXh+DwAjnWP9mNBDF5a1NoOuS7QxXJ7WlpQb+lWVQdxM/ArSquPT2FXIuDSN t0DznFLrTuez/DkwbiMI5JddrvOOnYc= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6667defb5a3so1240436b3a.3 for ; Thu, 15 Jun 2023 06:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1686834656; x=1689426656; 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=CEErg3d4yT8esB8KpwjYxwMfJsf51/geZ+6n58UDGJs=; b=EF9Lkit8KeZA+6lEZX30z4AtzxQeXjXaFk3VG1hfh2/OEXDrTUs+QkddvuqbwKFGw5 NNqqQL7MJRL8o5afvaoXGXt4M2Y5EUJhZvfO8yDoT8KKFGuNv4uRv4JQKKveXRRez2CH cpC9z+LFWjAtvwcmvfv1o236zgBYalBIf6twvsjmnqLecvTIgrQrJMwXOCE6tXnTXFMn ctm9NYACNGn6WIX2bZXp0PHMVPzmFZkGkETZdQjMNpURRfxtWpaAKdqsjVwGkcyG/1Et nnhuWEUU1xw2Jry13IAXUIyr1+L4D2uCbd0+m403S9gXx0X5hRfXAZ2XQQ4MIGqEJL4k 3rtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686834656; x=1689426656; 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=CEErg3d4yT8esB8KpwjYxwMfJsf51/geZ+6n58UDGJs=; b=J8ByFOfEnRdqbFKTDslImYBhsy4ve7aQMCUBz3ezRQjWvQ7kp6ukBhwd4LBs3RTR++ jiSxWhgY3mKgAqxyxWMKmbL23hxB4j1OneA+rBNYUINHOhL7fZV7iyl5NMepGJsXRVI9 pM+jY9Q2emN9djiixxdMyhFqSzTZqIUteZbJF2dtg7l8wMh4ITvPqhDU1jIy5pI44XtO tIHknFAcj4FloP/H4bhqeJKQUrZ4R5lfKD80X50/YGxrehT3etK98xVZli17timppJh9 +/EvdPCyxiBOT35XG9zbjlpvMfAmyeFFu5q/8UHMIAYe9xG2RP5I3a2vgQWTqLUVjOhl y23g== X-Gm-Message-State: AC+VfDxGmOTKjuMEVKJAGaqGT/9QdjsG0wIHWQc9uUTWDoSo539MS88/ k0VuJgYhHQC2eJgshuZpUA3cdQ== X-Google-Smtp-Source: ACHHUZ66o8V5eliveHpTDDCN4qg3tEA6UrvtjbBXn2YuCrBWuT9CqkfigWT9RVAiW4pUBar41PkAow== X-Received: by 2002:a05:6a20:72ac:b0:10c:2349:459d with SMTP id o44-20020a056a2072ac00b0010c2349459dmr5255910pzk.11.1686834656065; Thu, 15 Jun 2023 06:10:56 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id x1-20020a170902b40100b001a804b16e38sm14036019plr.150.2023.06.15.06.10.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Jun 2023 06:10:54 -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 8/8] maple_tree: drop mas_first_entry() Date: Thu, 15 Jun 2023 21:08:59 +0800 Message-Id: <20230615130859.21858-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230615130859.21858-1-zhangpeng.00@bytedance.com> References: <20230615130859.21858-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 393D1C0021 X-Stat-Signature: u9iy5teqkd89z55fcid6n4anfnm3iu6s X-Rspam-User: X-HE-Tag: 1686834656-846801 X-HE-Meta: U2FsdGVkX19T4AwlxxVB+V+AcLo9pD5AVS3eI8ev4dCFLalU+63+RhFXMheQYRooXigT8uB67ZYsi9q9LpYigRRJ9DAhwk6/3P3hMJ66H6ZlgdvQLqTyD3/OC6V3mu1S8kE8ZJqnuN2sdA9dyWB2HCgIgSZBEHO4bT0CgCEQbc+WwgkGqg9MDP9iqmTFsQ/sBlcd1zInTZliy5HrQPWM6evWX/SP92+8adj2Y+nMO34QqEDJ1FqDWp3QZCKu+JiZu4pkzbncNXE4JPHH1K8Qjy/cc8hoSo43zlHhj3yJCAequFr/1EFZfus85FafBMukDmslYxPmKj51slNpfSoT5VGeiedBxQ4FWAwRGc0ElrD3ykRktvZ9glAMNCnbJ1F+b+XmwBvsvfy+YKc3i9QgrlPAJ3OVwpWdxY6V97P53n+ps++a3Xrp2iZUGOSYQh2HhumVXEL16PDYkK8VcnqtGftU1LI5KS6ClZXvYz2pTo7lJLIXX1PcBpfHfckdOqjTf0wys8CpG37upIEFkzEIuRIrW0OIL5lOfEwI2wAwdiUCENBFGxa3BwFugn4aim7DejFgycfHOnUJiL5CWEGaC+Fq4fgmeaVJ2w+Ssr7f1PHxzIStO4MNA0UvIXy8Z6apSWMNa97a+DucLsLNvrbCoY5fkGju2bQLcIOUkb3NGlI789PUJHRXi0coxWWnsrhF+hBefv1AT4iOx0fpJE0+mLMMqOycZ5gas3tStSOBjBbC8P0dh5A8bW+jFAfrHpzFJFWUOsuD/cuUpWA2XXM/FkGTVkxmLvJ+/YqM/AbfKxy7u4sjFpO+gJVSWkmJmzT6P324KD/aWnKlV2t/e2kVcBvRr79cB9CFko+Rka7dZTASUqS76n6H7v4WQaB+k66m5gw8teoUaMfJZWjJwj3MAD1O5Haz53VqwYlqp/jMsjc4TSTMbCtiYbUPhR9eiZxYrCS9WSN/AC8obXdy3A/ j8wc9svS M682Suvq67/nKE/MManWGF8Tk8RUTldilUTvsIoOkLt3DfULtr8YNa/6KYTb8jeFzCaymjGSqxJ/wbY07p3tXu8nvmD6/nZ1PZUFaB3J9dhJQBZZ3Fh+la7+C7/3S9PAfBhWiNY4xXq6AzItQTLo8Uy+H2hnTs8c3bsAxo7t4F4UB97LNYqjGvJR0XTzShpV8/5oIdreLsjy1n4R9u3yUa3eoHSbe2XmJ69U+ekbm+uegCCxLyGY7lU/aOdT9ajlHv09pQhbgTaqs8L4C0mUR5EKmqqNNI4Vd4PEdkRIfZN0klMHU/2knMuB2fee/WfQR6oTHt6J1RMMD4xHCeEMLFKL7pmoJMpMWTKNWFC9OemCQb4v7Bnr9Ziq8j1U82414RtTmapX5oxin9SNhtSN/CRLnB4dntVXX20Hc7nZuxBzOZvDPeyRzILf8HUxluIyFWr2i54bvIUDaSqE= 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 --- lib/maple_tree.c | 72 ------------------------------------------------ 1 file changed, 72 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 4c9f40322f5f..3908a3937214 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6658,78 +6658,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) { -- 2.20.1