From patchwork Fri Jul 7 10:10:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13304706 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 95EEBEB64DA for ; Fri, 7 Jul 2023 10:11:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23C268D000B; Fri, 7 Jul 2023 06:11:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EAAC8D0001; Fri, 7 Jul 2023 06:11:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B3788D000B; Fri, 7 Jul 2023 06:11:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F15C88D0001 for ; Fri, 7 Jul 2023 06:11:38 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B8C0A404ED for ; Fri, 7 Jul 2023 10:11:38 +0000 (UTC) X-FDA: 80984399076.20.1C8D862 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf24.hostedemail.com (Postfix) with ESMTP id B312C180017 for ; Fri, 7 Jul 2023 10:11:36 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TwikCOYR; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf24.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688724696; a=rsa-sha256; cv=none; b=n9kL6XJTf69Sgth5zF4X90r6f1+h4tkGMIKAe3f15ZZaygHKbjH5Do0zndbG1WG5ObTtgc aInfCcmNIuK5fOectlS7Re+VjJPpuQhfeJLEPFtCRhKwvgYiG634ikAPhYVqrWKI26gTsL 7e8ioS68HbPBhhyq/nBDpOaUBABmHUc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TwikCOYR; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf24.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 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=1688724696; 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=yY4TunAJnA6iguq2KmXgFYhvimBAhbgzT6svnqGIOfg=; b=45jZkI+LfDXSk2LCrBpqEIUtbFEDZjhZsKJSSwQxYXxMu5sHgj5szpZ8QWi1zd7ikjdIKi OfdQJgfoJcG8lgMWcX/TpPvzcIaMoTxcFjU6X2T1oJrT7yiYazFycA+8kf7VFk3wbBFtTZ tghWspYc5/L7VJbWyC0qPRrcyE6tdZE= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-666eef03ebdso854409b3a.1 for ; Fri, 07 Jul 2023 03:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688724695; x=1691316695; 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=yY4TunAJnA6iguq2KmXgFYhvimBAhbgzT6svnqGIOfg=; b=TwikCOYRmU+nyw+rmp7MTLs8kn7oQmLYMUPlGa5onDJKbZD+caFPZZVqhYAO97Qaft QB6VUxVy1E8B8h4sze4YpSbZzy4Oq0Wi4aYOLBvH4+5bHA3REbmHK7K1Kro83eyWNXpD kjrtAO8mhRni83vhBplNMpN21fI0BmOMYJWKJCXYfaxGVMZ5jtGOlvcBSALSZYVzYoX1 Y81STm8yu1BFJk0KgM5I2K6Xad67IwG4ysqFRtz1xDKDJiYVhBKg9JoibVdVYgUnVj9V hOA2JFfZQh5DZ42J7yvDlEVPaiv///gb1Eef6ncsfg45HBtheJ83ejYQNVbFHuWsQVnA H//w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688724695; x=1691316695; 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=yY4TunAJnA6iguq2KmXgFYhvimBAhbgzT6svnqGIOfg=; b=QvWUjcLXdyQ90Yrs9wHtuAfeGuzU7/QKtVf2x5Fk1vFnYSoyzeDezS3MC9Dt0yThRc mHwzj+TnlegW2PpJMuOqoGC2HisdaLqrrybP3mCKEIMqnDm3b1flfwWoRXbHVskr0Swg ietejbjpMoZmeyPRWSBlDE9Wm7zSKnfyU9r6pUiCi8Dstv2siisTW1iyfyZG/Ws86GTO SfG14pjkOG0kMWyHLKxVL/fuTF67tFTCkxA5/xwdzhUGLSVy3r5s+XI0I+XHYpPgS7Uo LfpeNtMP8ynIDkK1oX39JSy7udqa3whkG/6gaFNw4U6fiWSjdjJEdw/tnOpdnSP1wg98 sMnw== X-Gm-Message-State: ABy/qLaXhSdA2pIE5s0okSfwuFU/V+IIXsXOhXw+bT7vFO6kS8GVR+VQ 6/qMFb6PrIYyQZWZwl9i7Y9mdw== X-Google-Smtp-Source: APBJJlFjCMbAOzxsCyuIBwr6DxRyBFBt6k0SyguxrnyEO1kLu9Y/81oZNUcDOwMa+uQ985BVpNsqSw== X-Received: by 2002:a05:6a00:1409:b0:66a:613f:87e1 with SMTP id l9-20020a056a00140900b0066a613f87e1mr4556377pfu.8.1688724695433; Fri, 07 Jul 2023 03:11:35 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id x11-20020a056a00270b00b0068288aaf23esm2602549pfv.100.2023.07.07.03.11.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Jul 2023 03:11:35 -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: [RESEND PATCH 8/8] maple_tree: drop mas_first_entry() Date: Fri, 7 Jul 2023 18:10:57 +0800 Message-Id: <20230707101057.29326-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230707101057.29326-1-zhangpeng.00@bytedance.com> References: <20230707101057.29326-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B312C180017 X-Stat-Signature: i6j47fcwchm6stmofcxa3rf15oc36qcm X-HE-Tag: 1688724696-871209 X-HE-Meta: U2FsdGVkX1/Yw618QM+OQmG2N1EsiKg2XaKoBEVJzkqPFFtLhaiMS/qgAu2UmZ6JOoNWe1rU0st+durQe2HyGKuKG9PUi9+tU4JNjAW4ntgDURWscso6e8urruLwu+DEGdRgEDtVBDjcBqsMnXY2BWcl7DFkhFfJPwj/obRHfm8c4wMQV5rcYH11ep2Ye2Cn8pV5YVEUTWIOyICG7M/qT5E9jsUdLGX1IcpMJWxCUU9FiTg7aQ0DZTc95hjhsmrxr3NW+jA9agVhoG0OzPWwtBhKccKLY8zcX4KRFymxh7iZg9B+DVN4yESRnSdPmgYCyfFcDWOGvUUky3P6xoXg/u0mlcytH5EtCD4jK5ekLvmEL6ag4KQv22MEhnSxlyCu3t/HJ6IpLVjd4cFkILi6EvrJVch4iXqm1187T6KpyKaBqsuxRBTcAFyjfCh6PS7g56UCPA2hgbmbmJpNDjqqJxUvHg/uH0Cb45MgjcMaOto95bQKaqMTq0QTpnS5OJSLiBFjrNKIHjfbl4AjXMgOy0ZozQ1c1/SjrUOJhttP6Z6J5sODpx3dPJsFCwrzgKzm3+NzOf5hPOZ056NDh+hnNZ559NKN5Pate+GfW9EA7k/1sqD8HAYbGj7tkTiDOXXwjDNXA6hEg39M1vrTKP27tQVU6ivbCkfWqjmsbBVO211UFka2sg0t7ICNqynFi7cGRTE5NH5gih5P1WC6wGSBFx5X8imzulFi2H2tYmJFaBgdnziRI9d8ShE7lrYgdvniPa+lf00LXbcNqgT3UpVUMpAIKHxDdHfWTD0Bj+tgHXdrVeyzNSgwzW3GniJcgQGNsiXPVZlAWR+jmYKXCtgFn5R7nm3QZfoIPJk16WOkpfDTCZmabF9/15PCSj3sVHk3TR17UB+Cjq3BT2B+k2gH/ry6xs6GXhrs9AEfNIpqw6McZt6o8RAOZkPSticquO0z0n0HAdJXzjzvK3aKe80 ZJ1drXju W/R/mFMbnDa/XW65hfpbGRBo7jhhGBd/pMWs3LyPtUbJiLR8FAvumRllcuB0BtEMcV4B2IV1JZskLw3j9D75hiezFnL424lU2q8GYkmgTMdWO7PsoiL/M3v6FWTc7YQGJHUkcQTcJnQvkFQULSxCZkR42ka37Aa8Ku69joqc7iNzNdIQmTyjzmicuI0oKVRz9MiOSqLudEbZCN80C/hrBdEgO/ouvY1pFyA/pBpdYZ/8527B6QK8x5bnoJKwGVA1lESG64vlokcU85iCJpDeHK+FV02SpOoqJR31os7kZvNmnV4ryTu5ecVXZmjmxqF0bRaWQwP9S5WN8HrKg/GDCN2TADyWEcQGtpRkY0IP+wE5ViIgZtuWUOEltkR8hkLbDOO3aKAK4lAq6nWEUt2sr8kxcy8xpvxasLsHjERx970dPdW5OMv6fqeDVibzt5wYCBoGnuD0M0ex50bQ= 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 8c08bfdc99cf..ad6810ed3231 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) {