From patchwork Thu Oct 24 13:22:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 13849012 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 D2A62CE8E70 for ; Thu, 24 Oct 2024 13:25:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 377316B00AB; Thu, 24 Oct 2024 09:25:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FE966B00AC; Thu, 24 Oct 2024 09:25:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1057D6B00AD; Thu, 24 Oct 2024 09:25:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DA7F86B00AB for ; Thu, 24 Oct 2024 09:25:20 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 81B811A0F94 for ; Thu, 24 Oct 2024 13:24:47 +0000 (UTC) X-FDA: 82708566318.01.474B728 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf11.hostedemail.com (Postfix) with ESMTP id C516D40027 for ; Thu, 24 Oct 2024 13:24:55 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf11.hostedemail.com: domain of yukuai1@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=yukuai1@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729776166; 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=WquNHdBVqCENuBg9u9UkV4ozm4lKfWrC8ZPHEbx0m+w=; b=4zpuKhW+na+xv1TqCQE1Bj5q/7550YSISE4bEXjjw9SH3Aa2BnKWxwhWWiB9zOy6fVsqI3 eQ0sr5Vg8ghSRKIOy+p9xBnunKEkfdPCsT6F/L14gLfSXd3JbgUAHFkbTFWoarh29s6jWV Tf80K1D7lRNdhqqogSPFZu1vZjpXK8U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729776166; a=rsa-sha256; cv=none; b=MEKq5ycMkKKNpbzZ0dRGnCORhKSSNsvE4Em5yKc+IwAZt+SQX+opPdZyRjw/CwzPuQ+gnm i0NohE626QJPxdDzS1ZS/UuUXXC6zQS5ZOE+ZwszC/Fd2Cup+256A4LIjkldWYR/Qu7xUy c1tXSNRsGRVJtZeO3VxJYh55BZC65eM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf11.hostedemail.com: domain of yukuai1@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=yukuai1@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4XZ68l48S3z4f3jdS for ; Thu, 24 Oct 2024 21:24:55 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 120C51A018D for ; Thu, 24 Oct 2024 21:25:13 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3LMmxShpnmfz6Ew--.42902S8; Thu, 24 Oct 2024 21:25:12 +0800 (CST) From: Yu Kuai To: stable@vger.kernel.org, gregkh@linuxfoundation.org, harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, viro@zeniv.linux.org.uk, brauner@kernel.org, Liam.Howlett@oracle.com, akpm@linux-foundation.org, hughd@google.com, willy@infradead.org, sashal@kernel.org, srinivasan.shanmugam@amd.com, chiahsuan.chung@amd.com, mingo@kernel.org, mgorman@techsingularity.net, yukuai3@huawei.com, chengming.zhou@linux.dev, zhangpeng.00@bytedance.com, chuck.lever@oracle.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org, linux-mm@kvack.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH 6.6 20/28] lib/maple_tree.c: fix build error due to hotfix alteration Date: Thu, 24 Oct 2024 21:22:17 +0800 Message-Id: <20241024132225.2271667-5-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20241024132225.2271667-1-yukuai1@huaweicloud.com> References: <20241024132009.2267260-1-yukuai1@huaweicloud.com> <20241024132225.2271667-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3LMmxShpnmfz6Ew--.42902S8 X-Coremail-Antispam: 1UD129KBjvJXoWrtr13CryUAF17Xw4rWw13XFb_yoW8Jr43pa 9rGr48K3yxuFyxC39Yqw40v3srXFn8Ww40qa4UGr18trn8Jr92q34ruFyI9ayfu34xA3Wa gF4Ygw48WFnrZa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr1j6r xdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2 IY04v7MxkF7I0En4kS14v26rWY6Fy7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY 6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWrXVW8Jr1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Cr1j6rxdMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCw CI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26F4UJVW0obIYCTnI WIevJa73UjIFyTuYvjTRGg4SUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-Rspamd-Queue-Id: C516D40027 X-Stat-Signature: 94r7upgbucgxtcxjmxdbkeobobniepru X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1729776295-86184 X-HE-Meta: U2FsdGVkX1+3ztsW6nYPgNRmSfzZW/Gmg1MoZkJAV/U6PFGjLnLC6eCfudj8QGQ/wC/so4Fu/cQj60UuN8PmA4VnfXrZ2XR8c6G6uZ8o2mC+z1YfiKrVnLC07slPvqoPVIYglJslPTQMQtKciabqA4VT4c3NCA6XquLYmNAJW6iTIbdccEb2X29Aq3dEYFemi6aDh67IdQIErTJUzYp2t47XiacN98eeszrD8ba4Z7VdgJSPPlW2dJes1WTPXGoRDF3ZS/326FexoqipdRDENQFWR9dc0txE3BwFnPwa89WnJpHfncx/204XZ0Pm/S/4PS7MHNPpaJMIsYg/iPJ9ZheQFri1I1wRA4Wi08afVOh2YsJETalNdLpNOavua9A3mmB8qiYLz5OGVLvqFC8pWmp9PxLUQ0rAw6x38vpDSBUy3uyO9qLBJmExqHxhEQPX9S7g11j9MxLiLiMRolKXmsgHlbCR0/A0LwEiKOLoAGHdrEPmsz1XHGf4yzSsfB/ek988qjI1grwMNJvRGlHOo6QhcCkFUFTaw2W7PTSje4fmYXC1XNiZq2T3wpXD1YSOyMRhURR2G7NVchl9Wf0XrCmjawHvVWAtLgNxHIlysYIirN7iK0qg+iADxVwKqz368+L1OnU4Us/gH8Tmg34QCGdtGrurLbJUk+6N3HeE2sxEK5uSqV6OVA83RpN23fiXTflEkxfw67UwaYkvVIKRRfL/sVcaHcKHMdtYXyVaTHI+rhsQN+g2oZivFyjvTQ5PA0OPeIIPvcJEMRgM2EGnikVMKiCoLjS1AoFJcPG0/X1Z/nxtZ08gxsHWmfxJghupTHQ/UGeYxWMfT5IxhCgkYWDNHb9vcdY1yRFdXJLVbipAbANkY80ngUoaWtUQryvMzYMGC8baJaDdoEbIA3zDXyaTKqC3QHv91CEaTStjQKkuAFxj88qI1K9lKAP4pPlxvnaS3Orh8OpRKtcJgUz LgMOHdZW +UGQ3g00VFq3PHMB0Q8mcit1BLJetoRdbknoSbeRdK1scPr/SCNCfOoWbrw9s6PigmS6+l77/HgXT7K9LNi+26wMjunax6hwOqemQACVBJ2e3IdbQLl0z4ZfdGwqRmyeYu6yYDqqEU3H9Tj/sA56BZYxI8gX9MBu0OiP5MkgFOYcD+L2ibefBjlr+thO//bH36jQAqPkgjk5dmM9JL4dOBLzRKKNj+elZ1uvRzdrg/Mug8hRobdcpLdFh7SO8s8+AoU4sNH2E4ZJFtwY= 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: From: Andrew Morton commit 5143eecd2af2b5424f7b96d53f17bb4718e46bd3 upstream. Commit 0de56e38b307 ("maple_tree: use maple state end for write operations") was broken by a later patch "maple_tree: do not preallocate nodes for slot stores". But the later patch was scheduled ahead of 0de56e38b307, for 6.7-rc. This fixlet undoes the damage. Fixes: 0de56e38b307 ("maple_tree: use maple state end for write operations") Cc: Liam R. Howlett Cc: Sidhartha Kumar Signed-off-by: Andrew Morton Signed-off-by: Yu Kuai --- lib/maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d90f4b7e7511..905fa1143f8d 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5524,7 +5524,7 @@ int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp) node_size = mas_wr_new_end(&wr_mas); /* Slot store, does not require additional nodes */ - if (node_size == wr_mas.node_end) { + if (node_size == mas->end) { /* reuse node */ if (!mt_in_rcu(mas->tree)) return 0;