From patchwork Mon May 15 13:17:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13241438 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 1F767C77B7D for ; Mon, 15 May 2023 13:18:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A51B7280003; Mon, 15 May 2023 09:18:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 989CE280001; Mon, 15 May 2023 09:18:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82BB0280003; Mon, 15 May 2023 09:18:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 65EFA280001 for ; Mon, 15 May 2023 09:18:37 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2FA8641231 for ; Mon, 15 May 2023 13:18:37 +0000 (UTC) X-FDA: 80792543874.21.E085BC4 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf10.hostedemail.com (Postfix) with ESMTP id E3733C0011 for ; Mon, 15 May 2023 13:18:34 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="i/UBgAcv"; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.177 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=1684156714; 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=eE6bxJv4UCRwtMUAfojMihpw2t2wf00Glyx+cFFRLZY=; b=JbPB5mjJyws/1MoqiiGxTwqNNLe8BU87cb/xlZqDjtgVN1/8gxK9buiZYHfzvaGrfG3Jhi 1EmSIxHnTF1M9bTRPd1TiLzhCHCXAHEs8fk97LFmVtrlLP9EvpVeX0pWpejFjwsEJ4K1LP KbUYcYvd+HbRBX/8Tpf8Y0UfrG/+jkQ= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="i/UBgAcv"; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.177 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=1684156715; a=rsa-sha256; cv=none; b=SNTgSVVVWQjJpe8byKBFQGZhjtR6kaKFPS5tdhiGNojK04AvBFdCdkRe7vwefD1bDZ3KLW HYW96mU6KgnI7SnNyR5tobP8Mjj5Yw4hkLzgzlFFGQ3hO0ZIDMzbc5c9QhcLk6bNvyV81/ WVefY2pV6CPdvg5oAqlWsg4I6RIQbqg= Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-64a9335a8e7so20685917b3a.0 for ; Mon, 15 May 2023 06:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156713; x=1686748713; 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=eE6bxJv4UCRwtMUAfojMihpw2t2wf00Glyx+cFFRLZY=; b=i/UBgAcvtHHk0md0xZxj0CroBxW4tMrmR2bdSTljlwKSLUD37aMCqdoB3xk08hTz8B ufwwpJ4/L8cFSKLhE/WqTszR14LYvDzpcrIs/zqzfddiaq+2m2lw0NJCccNrlxMYyUvJ z+6U/6D/Qxi0hOTLOqKuqc5SYDLXl3MalzJyFHBS690apJ25rDfSJMcS5XNL7Ad4MgoG 2ZruXFiyPzOqwMXcHF1dtyY9Ilkr7c+KJiyAfj3qLEGXNCE+n1yWwNIF9IM3kY5B2ipY kRutjohJOwPgYtotGv0CjxTX4YlT2ubdXf6t1Lx3YoAzu+mX2+WJ34qbuIwPJloqSmRd USGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156713; x=1686748713; 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=eE6bxJv4UCRwtMUAfojMihpw2t2wf00Glyx+cFFRLZY=; b=MeK9tX6/uVjubYZZE7/xGMYX1q5knGNXc3XrmM4lu/5hceHw3csOZcN1qxevW/eb9a CfjGphjq/JZi2GjGX/iK378JcuDNkwGl4FHNQcW5yThpgf3WTRAlvH+sogdgintqPVVe S7ixWwsfjAGtAcVJEl1Tm+U1Ejm82ZfkB/YOInqZpzMUR4u6Xwn9Xe5cdHtv8OPRfMWS bxHuNZV4sZkQTS1hWU+2lF/OJ12NxMLhq71leBmeh13J7Y3MIrpzZmcCkG+hFzqlmMPq XmckvBdqNDePzO81Xkj5X2Cz39rwNCZM7f5jeAYpa9CUELleLA91mWgAtozmyv3EeMXB +wkA== X-Gm-Message-State: AC+VfDx8CyOzb5BZD+aT/cD1/VvvWtV/YPZJ8G/UQE4pROetbeK1nvd2 gPN3Z6MvQJb3LN/3OymLYLKLKw== X-Google-Smtp-Source: ACHHUZ4ax8TBpv+8pqbDdmKnaFXdcM8+Si6LkP9bFQfT0YYvQy8V42QO+LcbU93Ang12fqFYOt+cCQ== X-Received: by 2002:a17:90a:bb05:b0:250:af6d:bd7b with SMTP id u5-20020a17090abb0500b00250af6dbd7bmr22794048pjr.24.1684156713588; Mon, 15 May 2023 06:18:33 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id gl20-20020a17090b121400b0024749e7321bsm14190014pjb.6.2023.05.15.06.18.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18:33 -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 03/10] maple_tree: Remove __must_hold() which does not work Date: Mon, 15 May 2023 21:17:50 +0800 Message-Id: <20230515131757.60035-4-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230515131757.60035-1-zhangpeng.00@bytedance.com> References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: 1u3xz6wi9tud9w3mzna55wguigg67grb X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: E3733C0011 X-Rspam-User: X-HE-Tag: 1684156714-493609 X-HE-Meta: U2FsdGVkX1/d2j8pvqiFGmlNptmX5obfRRWNzG0fAlAXbv/coNpbHUVtKL3OsbkV1e+OygLEAsYZxRH+bVAah/xOo0yPkhZtJCdsoan3Jj3aHcOuC7CfsgkUOnWXm2wjY28bAHue3Gc1RHwLcl4x+A74OwGVmr5MuRB3gApAohuRZQYIPVks3WXZnXWxP7o8LuLitmFwn+pH2zLzxrf8Gw91a49K2YSI/X205xKWUTJdkjrk2t1P0Sgk7cCmUeePdjVkO4Dw9L7EYGHaNpwMS/Lv6gFridSt6kNV9dbXPwfv3BqbizgDidL/ecYVlpFu6eoE0Qw4uyMTyq8EB0B1px5yE8Gzo03O9ulq1R2kX1qmFYPWysr9EUWzxQv6dnM3wMK2W+1Mw36oekuxSJlXapBk8s8BkLi0AEtNXVFLxikK6I6ALzGPJXGjzZoNjkTcYZYBbsYKLpuIG0huOwunX117xhd/5Gluj1cRCpGKDRflEn2xsoGS0pdyUg03qneyPjLWkoRX7FBFZ3+RM+qY5mvOJ5OK1xNKrxzolJtnQ3cJXpo6P+pWU/SpiS9yHm1BtM5WEgQ5vBbcF/8NX8HPfW8anlqcp530IjXkk4p4EC12hNrT8d9ZsLPSHcSLHcTp6XehCXTJOcXDE7eKnZC1ZKz6swZT4AiUj+V/3Kr1pCJAeGlnkK1WpKcD9ST6A35RyirGAk/LyQr+a6yosGPZ/I4jZHgcQwplTCj3kJUQCPGAsNZ8PvYQQHZrpAXm6sT757iQ7yTzvCYcL2Jlrm/gYnvovgarBezagEYoZBBkMBzqacFGdTrtyND7urb0prvvhHu9XxcN0FNsjUhmQfb+zCxZ6MRGNRastbDaueIyYZEviwU/FDxLGQLrQHdabxMaDUFl25R+Lf+RW6e24V+sssBqWsKTpXcVljUd46LXdxPNklfYDdsgPOfJq0Vlatc495y4vLsw3OR5+yK3GEc SCx/rsLP RISEpKwaI3F/D2msobWiWbmMsnN8yPgrYFRGiU3NOrVY9MaLyAZMIVqow2m0eyF3DpACM0rP9ucy7d/8FIwkPuvuMEoAyxk6wLsyAt8g9sj2VO9UskKnNqYjbDJzgLmH8ssq9Eg3mSfisyeYSn66tQpCtAOIOGuF8nsTZPTGv2+xQ4Xr8nLgrNGdX5Wjkejv59ZyG0jGBFwndfL2jHbteb2mGydCqdIYkwt6wseHYyjkpUAlzXcymV2TU6mQDkYeDeyRj1JdL4sjLKA5NJ5vcnYZo/LDQk3ZSvmu5wiPwwMsBjqnvSHks+6kU9VrLgVLDJGnq1Sl51/mUOZ2581TuSe2OZ+5r8wdz/tlEx/l5EmQhem819chf04oLfdzgb14B44THjtEG+SeFUEu9R3xTfke1o18N+8CVpOQ7ETh6FrPHtz9XgW2igeY3EDJzVD3tdDwqB6Jk8geMqFc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000075, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The arguments to __must_hold() seem to be wrong so they should not work, remove them. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 49dfe81dfa1b6..43a25d3042c1b 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1752,7 +1752,6 @@ 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) { struct maple_node *mn = mas_mn(mas); struct maple_enode *old_enode; @@ -1792,7 +1791,6 @@ 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) { enum maple_type mt; unsigned char offset; @@ -6198,7 +6196,6 @@ 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) { if (likely(mas->node != MA_ERROR(-ENOMEM))) { mas_destroy(mas);