From patchwork Mon Nov 11 21:53:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13870700 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 9BBD1D2E9E5 for ; Mon, 11 Nov 2024 12:55:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E15B6B0085; Mon, 11 Nov 2024 07:55:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 71B7F6B0093; Mon, 11 Nov 2024 07:55:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5426E6B007B; Mon, 11 Nov 2024 07:55:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CFC8F6B0085 for ; Mon, 11 Nov 2024 07:55:07 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 653B0418A1 for ; Mon, 11 Nov 2024 12:55:07 +0000 (UTC) X-FDA: 82773808152.21.5851C4C Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf11.hostedemail.com (Postfix) with ESMTP id 43EB340002 for ; Mon, 11 Nov 2024 12:54:11 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731329514; 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; bh=YVrUUmNB/6qCylmXgGwaFI/+5BomZYbmrTRX2XpHfnA=; b=uwE75y5Ac5bvyYNtnSC06+g9rHFXkQwIseMKIkkxSJzIRTehnWB7mr6LDeNfvyrRBix5Gr 4azm1h+8y3gVRiolCK7mPQhOczj6xnLSxpr03aP7Jtt+p5N62f+q0sFSKQ59EuOU9Yqvv0 UP7dDvOEoU44tI37R0yN/czMee4/9vE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731329514; a=rsa-sha256; cv=none; b=okZir6rxDBv+DkUk5xZXTCe4T5U2gVj0GMQSg3+E8oe/hN2hXe1T0JTjMe02t8ftIHqvGY jkYm2ZTh7Z22uB67gJgUQ9LESXZf2IvzNbhrqrq0qER38LcgY7wG2JRQS8jbOg7yeHOscp jRWMLy84RBwcI1c1sQVgK+y2E73trqo= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Xn8dc3Lrsz4f3kk6 for ; Mon, 11 Nov 2024 20:54:44 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 882151A018D for ; Mon, 11 Nov 2024 20:54:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP4 (Coremail) with SMTP id gCh0CgB3n4Oe_jFnllryBQ--.36628S7; Mon, 11 Nov 2024 20:54:57 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, willy@infradead.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH RESEND V2 5/5] Xarray: use xa_mark_t in xas_squash_marks() to keep code consistent Date: Tue, 12 Nov 2024 05:53:59 +0800 Message-Id: <20241111215359.246937-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241111215359.246937-1-shikemeng@huaweicloud.com> References: <20241111215359.246937-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgB3n4Oe_jFnllryBQ--.36628S7 X-Coremail-Antispam: 1UD129KBjvJXoW7Cw1UuF13JryrGFWxCFyfWFg_yoW8GrWkpF 97C3s8Ka1xA3WUKrnFvan7t345Ja1kK3yjyr4xGwnayFZ8Gr1Yqay7tryjqFnxGFy8ZFy3 Cr1Fg3y5Wa1UZw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU s3kuDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 43EB340002 X-Stat-Signature: 5zgxz484q4xpp8rq3xrniqrhtsxxd51f X-Rspam-User: X-HE-Tag: 1731329651-497096 X-HE-Meta: U2FsdGVkX180xeBrTvWGmqqrKUGqQFzGhTyNxpZWrsbx9uprhqNWfimR7EafqdU9mZYbq5l3ascVP9opFvYx9f3ufpRQ2rfsRpp/xbye9iG8OWpq6Hogv9lQEA8l8d8slbNWUbBLlKe9HzntrFf5+eLBHiJkYoNHOkS9Ci2R4LnXoGAEuDT74l9o5/Zaf1PTgYz829paGsbh6VMas8jELw2MNLmpehEmfwcGKjbWrBhSHAyGySwbLkaxk9rKOmEnBa9f7dKcauXFSzWILjuuseJrbk+gcc8di4XnUgL5Up5W1Ex1OGOsl+wr9L5dMALesR0+P/aa6ZdzSl4EdxASVVU9I7hZup5Xdypbx9ZbIl+bTmy6E1UN+AQfqSfxXMnVj5acTnezC9cSevD+ILCvX1v7XdA14htHfpgvk0RnrtFcMkfcjXAHCdXp8UQDOncjEHHniCoc2xsaqb2rIKTlTZw3txjoFxh0P3sATd6a2YgSugJsjGNTw2Qrk0E2QuyuUUyJbOLn2qpM7n5wBq0TMtX5XERr1w3x76JSmQEC9ZKC4DpuTvKsISFKXZE7nMoQvALdtw1FFZt4dC2mtpQtPCYWChQE38B+KPwMOBrUqPZzKYQXLpN1giQyt/k1h3mPebGY5T3Rfa5LTG8t4nQ9BGGvxhJ5DjDhnrDpd3gPlotFk5V1YYWZgzx2IFFmKe2DRcHG8R/0BBLNt3Eg5cu9DjO2qrGm7AEKq+twuAtSefimhc8qzuR+LA6t+cvOzJQ6Rm37fJhskmS2ogGoKKi75rd0XHLSzF0yxs3jLJTMTTSa8FE0rsgTre3ZEwYx3iYK6sNv6qxzJH4ISRKWMf1jk3YR6ZVq23nsmoKRoy4BGLeg2hScZrAJ2455TqBti4KyOcEoHg6QFahAlPkFDxdbbAmh+vs1VCcqKVU4zbeS7OkqR9+TQ+8/5tLoFk/FX7aJjIqXf8guBJbYikPXMw+ kVVZZMxe bBmi2ZcGA4dhO9zWWwdEqlIBdDj1K8eyfilrtcQNKaDyu1iWhKijPzhIVz+7jNCikl3J0IqqTtQ1iqHDrMHuFM2dJ2mxt5H0XIwSaTvPVMV2m3qUATvYvx7R73J4jMDXSTEILe3V2Mp0e89UeO7gwABtGVHTEmP9At0HxX67LdTXmTfKU0f4pV8dYEfqNXegqhLQ1uqlkNPqJMWpJkamJkNHL5g== 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: List-Subscribe: List-Unsubscribe: Besides xas_squash_marks(), all functions use xa_mark_t type to iterate all possible marks. Use xa_mark_t in xas_squash_marks() to keep code consistent. Signed-off-by: Kemeng Shi --- lib/xarray.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/xarray.c b/lib/xarray.c index 4231af284bd8..a74795911f1c 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -125,16 +125,20 @@ static inline void node_mark_all(struct xa_node *node, xa_mark_t mark) */ static void xas_squash_marks(const struct xa_state *xas) { - unsigned int mark = 0; + xa_mark_t mark = 0; unsigned int limit = xas->xa_offset + xas->xa_sibs + 1; - do { - unsigned long *marks = xas->xa_node->marks[mark]; - if (find_next_bit(marks, limit, xas->xa_offset + 1) == limit) - continue; - __set_bit(xas->xa_offset, marks); - bitmap_clear(marks, xas->xa_offset + 1, xas->xa_sibs); - } while (mark++ != (__force unsigned)XA_MARK_MAX); + for (;;) { + unsigned long *marks = node_marks(xas->xa_node, mark); + + if (find_next_bit(marks, limit, xas->xa_offset + 1) != limit) { + __set_bit(xas->xa_offset, marks); + bitmap_clear(marks, xas->xa_offset + 1, xas->xa_sibs); + } + if (mark == XA_MARK_MAX) + break; + mark_inc(mark); + } } /* extracts the offset within this node from the index */