From patchwork Wed May 17 08:58:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13244466 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 2D7C8C77B7F for ; Wed, 17 May 2023 08:58:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6CAE280003; Wed, 17 May 2023 04:58:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1DCE280001; Wed, 17 May 2023 04:58:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE3CA280003; Wed, 17 May 2023 04:58:58 -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 A19C7280001 for ; Wed, 17 May 2023 04:58:58 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 47B0BC04A5 for ; Wed, 17 May 2023 08:58:58 +0000 (UTC) X-FDA: 80799147156.02.B8A49FA Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf02.hostedemail.com (Postfix) with ESMTP id 4B84D80012 for ; Wed, 17 May 2023 08:58:56 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=H+MW+AUW; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.174 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=1684313936; 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=JHlXin2w6vavc2+J7pEpRe/GvVWd1HUUirBvk9ov2Fw=; b=dLWyAS8Dj0sAdT2+RKqkJ8l74fscbNrckcb5tLn0OMGGuJUf2Vxe2ghkBjIaMOs1Y3wDLN FdUkFmB4pJE09d0na2ORBv4+zo2q3oFkZW/nLQ90LGpJp7ZOwxUNUdx2BeK18wFGkz7bEp VdvJUgFlRkDTlsNFxdRrl6K2zPB4RwY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684313936; a=rsa-sha256; cv=none; b=gjZzKXsLpNeZDF1ExEZrNNtb/5F0OzQ83H+7Nrt8I/ICL78VE/5BEGpfDaOFt8g16lnBp3 vdbBzVnuu3uoSCXgGf2C6a3PlZQQWg/dVJmvmplRKouiTv3cFNFwODJgpHtxDsHRy+SXGe 0LriDzcGYBL/NoBQoKbhUpurY/TNra4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=H+MW+AUW; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-643b60855c8so468879b3a.2 for ; Wed, 17 May 2023 01:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313935; x=1686905935; 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=JHlXin2w6vavc2+J7pEpRe/GvVWd1HUUirBvk9ov2Fw=; b=H+MW+AUW5biA2FNoD0LhWFVRD42pY2bqjWAmvKM0Yoa4zTu8srZy/Gj8H/aG3FvJL/ PA7sqqD+P2gUrAnlcsVHplTZl7wgbKAwHdTslukWmxEbgOXjPNvl10Imxfu9KOfb40wV kDTXMdOHxMgcLMLVn0uEGcjpaDT7ki5Q4pHfq/86IbfqVFgUdd0aXxibTk7EQxs3FXfw Ft/AS4NL32YXcLAJ1KSYOVm/6/qDeLSjmWKXoqRugkYoN74YskuK9j1WX96iwuHAN6EV tX08aUTLefRpOaQIL+Ad8e1kQkrnhOc0fhXJVRy2BGulNjX5fRt6fSezcJyZUWd9vLcM LL1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313935; x=1686905935; 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=JHlXin2w6vavc2+J7pEpRe/GvVWd1HUUirBvk9ov2Fw=; b=hooZBedW7b2vNvVlxvyJNelX4+oPs6RwWdlMp5mqgxy+IXWEMtgc72/Ti4jMbI5KKy QYo+6ovSbpk8mQ+SOvp2VKmmX5baI4e83t4Cifb6GstvPflMcXYpmtQ8aObrITHaE5Eb aEjWlu6ALb8jzIhunkHQyyIJAhtGBisd2YuV5m8tfzU7VuG7KiPLh51Tpx3dO232XT7H PAwfk0tMZtl3UxK0INQkfadXmnlGnIvpnxc40UWfDvGq9H/hifjYUp1blyzt0jg3gRLw z6kUFlO9JOs+A6Cr4EF7AHvXO0x10lftu/3MpOkOVLu3FXMgrozLJrdz+B2s+oL9MdRl Zouw== X-Gm-Message-State: AC+VfDxYR9Zzu/Z3tcqqiKdOvaz2Mo+PXzbsJVNrUiqusP05V7T/IqkN WLl0FKGKxWTlrmIAmb7/XCfK1w== X-Google-Smtp-Source: ACHHUZ6NOi/1YycNdfdoBvrCAF+/spFRL1mJivf4kbwtDda7IS7ETsJwYzP9XTa6xQROkzqYEveytw== X-Received: by 2002:a05:6a00:1a4e:b0:646:2edb:a23 with SMTP id h14-20020a056a001a4e00b006462edb0a23mr135673pfv.1.1684313935021; Wed, 17 May 2023 01:58:55 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id m18-20020a63ed52000000b0052c9d1533b6sm15056765pgk.56.2023.05.17.01.58.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:58: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 v2 03/10] maple_tree: Fix the arguments to __must_hold() Date: Wed, 17 May 2023 16:58:02 +0800 Message-Id: <20230517085809.86522-4-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230517085809.86522-1-zhangpeng.00@bytedance.com> References: <20230517085809.86522-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4B84D80012 X-Stat-Signature: zusttf6yyzy8hjmjrmg4jgehzo4a7yp4 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1684313936-36975 X-HE-Meta: U2FsdGVkX1+nXZUFxMh2gRWMKlqpkqnP6kKQewnXLNKBiWrn4tGhsagOtJVXw3NYYnT09U1sW370IwwPzXg6Q1MylG2woZ0xaMhUjtlDLgXVwwagZCZuO2BItd/tZE69PJH0DqAhwy+4zXeVgnku7+Xjth84zkquIpeH/FvD8+0M98RFbX/LRw2z2IM/r8+tNiteADDIL28mS8OrTDLrlYwkifmVYJNyaw83AE37eaG9OtkdrwpuDmIbHVrRC20nPRDT0Hg8+Hnue9y8ZC2Q3uLgHZfni29hLfRKUEXdzpXM9QEM3HOdyy3HmNgkt4FtcyUXGjAsPNdWumReWsLHSCTX9EIcqHMC+Q+WkgWdKUe/SemnLl0GdgxGpyj6+vBJVheTwytFdA3SnrwpenSv+q4dER6+IGzYf2INxrrcKEliu7oSRtEZd1DAdOBJY/aBYNdMNG/2JNU3ynRJrJvMYD251qA2Mn4/Abox9twaHXvkCOhp+ad/o+cozEkoiqdwCp88B3RlRgyuCruxboHu/ZzUoNIR9c+b0gd7OKh363qJ4JF2dpYKo49+CgbtPFKMTuamYPOY8lwT+wO+RamaSeQY2wsc4+GOB/h6Kk0F12Iz5XvsuPfhKpMMiwfquK/yvxnxsx5+AseZiqKGe5fXhG7tHLnrrlW0HdwhbWkaaYY9zrT20/xhlAMyQS0CL8hy4wsczSQsIygn67JWKB9yNlQQ2lUH8UnRd4jmVrKITXhT6e+KO+ScoQCG6mIjHnBOy0ZyYK8dxm4zN5wPYTSAVukzR3OIoPFjgg40xnLL83axKryeNxm3DXvDMZUfcIED9ZDrDH8xiEIEn4JkL5YX7mDY1nGOPbwuvmE40klp3W4KdzN6H4EkcSYXt3lssjJ6YF9tKJ/KAgN/ht2N2z6gzvsiB8k3u7F+NjbERTJ9iUmFC86PwCrdvl9nrGTtsbrS6yNjaeHdJQHuBqvd5XV suGCIxfz 2bOQIBZFEboARoq9TB+URRbYAIFSxX9V7ykgYXGNYnq9dowl6KvAXwRm+6B8/boZazkJJhB+P21mzA0+QwogbNx+3T4J11HMQzykrpGRQgfGi682WnQPLr00B83X+Ojh6TtspI+CcRmmDVEDdqIEUqX5Qu953XoaN9KeoJ2B01N5END5ti1p3wCLNGuryQxAMGBaypbis5/E7w4cV5T73S7hsA7Vrb91e9tYByshw3v1gBSUUVdWDLEBGencgLyL328cNeYtCDvj+TAAiu/OiF/qsdT42bfedja9dH8m//6o+MeRQ501Q1fHFR3XXhhmtSasJ+K8ihr5kJcXitoxt5BYdc56pdhsbEiTSA9DSH79iqhMm5HSyHap1fgj9ICwg+PMP2YL1Hfw4SBftFFabYX5oRr6NxOCN/9hyCziBriiSV4LNkJfLf5Ytp0jZIjdkUJhvhiRpRBsxFxU= 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 --- 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 c8176f360dc2..bec9906b0c8c 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);