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 B6E04C7EE2D for ; Wed, 24 May 2023 03:13:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DDF7280006; Tue, 23 May 2023 23:13:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4671C280001; Tue, 23 May 2023 23:13:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E21E280006; Tue, 23 May 2023 23:13: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 14459280001 for ; Tue, 23 May 2023 23:13:25 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C3F22160557 for ; Wed, 24 May 2023 03:13:24 +0000 (UTC) X-FDA: 80823677928.12.83BCD83 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf25.hostedemail.com (Postfix) with ESMTP id EE311A000D for ; Wed, 24 May 2023 03:13:22 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="i5/jXr97"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.178 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=1684898003; 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=EQslJb4TTQ6f3QnMShcvH80xJECcy+dWiloGaRtjezU=; b=C9atDGZSAg1ozR9/Sovdhiv0PA0xY+8voyOTHc1L9CifJOV+sp+a0tWm+p5KF4/FkXWoEj AjfI2ADSj7rjMhOzN8nlPKLZlDfq+hV8b2fYjrJr5VQmNK3Z7ZqmEsj0HE1zZASDcJ5Yob E4eDLNRz0GB2BVkgMrKpGGwS9eaXweQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="i5/jXr97"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684898003; a=rsa-sha256; cv=none; b=LX95q+vTlVmpmZBfaCxDTrsmOvuGZdB3uoDBVHkLyWFgsh3xPFCeFcQgWPPc4wUtextbjA +VBCuC5S6zMsSi3uXwMdjm3NyRWJMYkQ/tbvPK+fcVqgsLtDqrpsu5LCz6e639a/UuWmbE 6KbgpgJV2IYGa7GzggOrLtlGfC3ZLrU= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1ae3f6e5d70so4043995ad.1 for ; Tue, 23 May 2023 20:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684898001; x=1687490001; 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=EQslJb4TTQ6f3QnMShcvH80xJECcy+dWiloGaRtjezU=; b=i5/jXr97UIsdHU5etmogFyDj7C2w+qodiIstyuPmozbpYtvlWbpyrBC35aIkuQPKWz T48K+vdaW1bxGnZvnRg3yusdz1FeUyYztH5umoQf7+8NEMw4B70AsUa9lwjGJYLS1KMr 5Ak8I4VJpurMBrvbJKEHCdlTz2Ij4qCE92GL/Kr/B+XuVl/EtInaS5I7YIVMjD/yRqwM 26dxR3Xnoyt5A9f+asTG065uQc/ezFzj/1eGgwED/64LZk6iQWjVzpyw/nwBX0xtIa8h rnd7xldyaw6azZ//jr318c0sorc90X5wtNPgLeeRyjjuIuzWAOFrLzqSi4N2GmqsSyxO wRkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684898001; x=1687490001; 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=EQslJb4TTQ6f3QnMShcvH80xJECcy+dWiloGaRtjezU=; b=Vy/KNLekRzHF+eHzxyRgQ63cYZXvIe5QsZ9+I52AXbT8O8G287O/wIur2W/xc4QZ7J gyR37DlPRjc0Of3xxtjDw96faj5/kUsUKvPat9UmveFc0Y2Zr1d/J+6mQbc6EBOPvM3f Vf6Ili0ECGnir08QJ3ba+HlU413lwMo6sCVw2R4scOzcBjZ8FBEMlrww6Rb0u9NjiA+z xchk5gWusC17jQxFM65zyejfX/Ns7n7vgWTvxIU/49tJAyVe+ZTSndBlWyoCrUbL3BFf Xou46whn/35pXJ7OXMotahWZ4HEYQNeDcEbu5JZpwTnJbbGDqiYO8jU3ZJv0s1NTv3kT hFQA== X-Gm-Message-State: AC+VfDwTxPG1Pt+cd3OrHme8lalr4EdG9kwNFAT/yig1ejWNiiZkd/3a 1AntfaKnxc/5wV3qhXuecszm/A== X-Google-Smtp-Source: ACHHUZ5qQNihL3luGXrPNDdY/XEvLixGhNnqd1Xi3kMKq3IJz6WAsLBV2qTKgrCJTB/k05AHToVxbg== X-Received: by 2002:a17:903:11c9:b0:1ac:750e:33d5 with SMTP id q9-20020a17090311c900b001ac750e33d5mr21405280plh.15.1684898001677; Tue, 23 May 2023 20:13:21 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id i4-20020a17090332c400b001ab061e352bsm7480769plr.195.2023.05.23.20.13.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 20:13:21 -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 v4 03/10] maple_tree: Fix the arguments to __must_hold() Date: Wed, 24 May 2023 11:12:40 +0800 Message-Id: <20230524031247.65949-4-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230524031247.65949-1-zhangpeng.00@bytedance.com> References: <20230524031247.65949-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EE311A000D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: bd3w4anzhrc63tac9dyqa5cka6wrebkq X-HE-Tag: 1684898002-86587 X-HE-Meta: U2FsdGVkX18hCOl+pYmFjIukdsKWPeYGxhq7glnbU7E6LMkaKgW6eG+dUhzR0okfD3VE6VkhJocVcyj6z/r8pJSURroLWp/EOibJU+BqxAipwQ4oRe6K1NWC5jrmYioIHvAMKO0KuhymEfHKiYn1369lh1RvYAWFpv27R0JpNGpSqPq09kQRcMWmC43tP7SCIA9XyNlTFNYDoGMH0stxfC70i+uVEiuZrapKDraWyEbhdreXXRP4M4Dbw42+XmEzhocPJBXIsRlBKYzAMJUUxXiIUkNX3My/f6r+gpTKo/lM0aCs4dAlh2GCXIQ55UoGn6f0pmcAknPIB8Bl2l7sotqELPjUOldDTOKm7bEd1H9MZJa+aV7XwZAZTeT+zn3Qw5o6V9tFqnEkMmO2tSUpYjdUdiwiCWXhuvlXXeNPrFQaJhZulEy0TarmNX17NnIsi93UpOySK6Seuu7ywZ+uhi2oa8ftLyxg+12HIzShRZIb/aYSu+BZpQK0vBGQfeuln4T4XyI2rGeNNcIpEZkbFfhyh8HE4zwPwEmsmIxUmEQ6sP2nkhtE4KaUBc+1rrj52iI+kBj7wAV7VM5f9O3PexT5nPReQV8mCKW/kD3kRzc8vp1wYswvXeycCuGXiuUWfE/T9idXVHVI4CEMTAV2B982yBqks3UYqF0Y60cbpBYnjg6pXwoXvJ0oUa0e3bCFNafs8mgeAvu222QmChmYXmbZTI9ipNnzdK3gEKZ3ten1hoYqaePmPMr+C+z+LWoUVO7vk1+3L93O2EREB7ZoITfYFPH9jnq4eZj0WoXznsUipx9fCoj0nk0WBo67nPGWURPj57fYzeNoJtOhwC690wgClVt0ZwGu9TCu1DfNK2ktR34tnREpFEWVo/hQ4w1Uu3DHMSYhpXJMeA7pl7h6IbJb0P4G2/0ONGms5yM21cOUDSYCPz7wJv0S6Aju7RAaNi2y3Swla+9tsQfi528 NPrcPxO1 Ta5cfWrfbVdVRDCnxvLYB8CIGDOeSrZ0kYAIYqUSAc8mv+vz1mdMROEMEmO7loI8Dfa0hbMxOAnOkmst/+Pi6ghPwp9XtIYAK3DCZsyM1BU0YEqCGKpqZTX5DOp1eHjlojud2l++6u4Kh8GsPK4CYu6kdomzurgM++VipXV1itrOptgjPjoG/8bu3KIfnBkyJuiVJVnySZsxh+IsGN/ItGOz4WTOyyWZcPN+p9G/CN51672nqTK3wt2VtJHK7SJ7z9poCMQFxgPk2iS1PTtgaX3LefvZ+5EMwohN6zh+j7bNFQ2QUp1Jvt4OsidcrJTmuCZhsmkYuYdUZZfC/OCWXck6BfYJtGQ1nx5fhAOq3z74tBwLhLp+6IPEMMRZx/6aeoAmvVyp9wZHlX7L6DZb+6/6uZEG6iFBrwWpEVPbiv90yoQIZLYvIuCg2OVYR5HzhclprMrL0/l9SelrSFqUvRIDFCZWiCgr+pYoT 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: Fix the arguments to __must_hold() to make sparse work. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 263bd0ccc31b..3fe6a6685384 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1752,7 +1752,7 @@ static inline void mas_adopt_children(struct ma_state *mas, * leave the node (true) and handle the adoption and free elsewhere. */ static inline void mas_replace(struct ma_state *mas, bool advanced) - __must_hold(mas->tree->lock) + __must_hold(mas->tree->ma_lock) { struct maple_node *mn = mas_mn(mas); struct maple_enode *old_enode; @@ -1792,7 +1792,7 @@ static inline void mas_replace(struct ma_state *mas, bool advanced) * @child: the maple state to store the child. */ static inline bool mas_new_child(struct ma_state *mas, struct ma_state *child) - __must_hold(mas->tree->lock) + __must_hold(mas->tree->ma_lock) { enum maple_type mt; unsigned char offset; @@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(mas_erase); * Return: true on allocation, false otherwise. */ bool mas_nomem(struct ma_state *mas, gfp_t gfp) - __must_hold(mas->tree->lock) + __must_hold(mas->tree->ma_lock) { if (likely(mas->node != MA_ERROR(-ENOMEM))) { mas_destroy(mas); -- 2.20.1