From patchwork Tue Apr 25 11:05:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223208 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 69543C6FD18 for ; Tue, 25 Apr 2023 11:05:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A50F6B0081; Tue, 25 Apr 2023 07:05:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 054EA6B0082; Tue, 25 Apr 2023 07:05:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5F266B0083; Tue, 25 Apr 2023 07:05:53 -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 DA2376B0081 for ; Tue, 25 Apr 2023 07:05:53 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AC364A0361 for ; Tue, 25 Apr 2023 11:05:53 +0000 (UTC) X-FDA: 80719633386.01.6CC6FD4 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf13.hostedemail.com (Postfix) with ESMTP id CFC2520029 for ; Tue, 25 Apr 2023 11:05:51 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Jmn8+k2S; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.182 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=1682420751; 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=/5HiaDQy1gV5OijIvJDqywUjC7+FvWItMLIDy/cp2lo=; b=671XT/QL19K9d6NlzxS3XmJsfECVjrCvsOOzfb5yrZd3loqTif68Bxo+AU70rhb+8h//A5 C1NfvcGojefoL/nyaxXPR+7u/QrNtlFLj5pv9QZ3lHdGSWWUzuxdwtbXPKNuTLsJoS4Jxp vksvZRijTtmZKHtco90nXcyxAjt7uyE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Jmn8+k2S; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682420751; a=rsa-sha256; cv=none; b=5Ayo8M+pwmEuSc10e8G3Qw26+FMvTkxtsU3LOO5Q7fM6BLQsf190AOPUADTxLfIZO/df6n 7mbVQh9JzJu8evyym3Q+TP0yjM2dJ9UalUkaV95cJ4p37+Poyqp5RH82Ckia+o0DNn/CZj hukSjXu68Rz7MLEedIwx4lRylr4C/EE= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-63b5465fb99so4702391b3a.1 for ; Tue, 25 Apr 2023 04:05:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420751; x=1685012751; 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=/5HiaDQy1gV5OijIvJDqywUjC7+FvWItMLIDy/cp2lo=; b=Jmn8+k2SfFfgMhLQds+Cr0nlYahkoptl1RwDbzAx8AZV4daLWkUna/d9KpjCx2Rfy9 rmCt9o71sj3yTlbe6K2B/hk/W22x/AoY5gUneeoO2WZBUgG67nocT5AJKOv91QCs4JN+ DZCnL7fxyHriXlCninrD3Zk7URi4nUfnyi5EmbP/3Gha1H6bcYRPYa70gVOJDs6+9d0S qnpA6xJhk/rQJkofq1EEOa8tqw8D0zjeLVXFud06M0NuAFQZVoamUgVTSmw9Qqf/CECK aW9WKvh1ndvQxmuIyREMN2Zd+vYx5GuyPdQSabCRBc2itdPqh0hvHYca5F8MEElf7xn+ 3LeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420751; x=1685012751; 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=/5HiaDQy1gV5OijIvJDqywUjC7+FvWItMLIDy/cp2lo=; b=TonvJrj7DPpyvGwNL27sqZk4pbrS4GOdvc22X1RzzyLN96DW2m8DkeaZWZ8LHifxBn SXXEyvHeS9Ri8gVz+UIfP/7mN+G9TkUkwNc4TiCoLgSs1p36If4N3/6GCSXwAQVx+gMs 30tB/DTK55LeJoFFMSS5nHGW6lYBTUMVaTFkZeHIGl4xaP9Ran7ATTD1iwCcOQiqsvMJ 0SYCjqSqMC36a2ab7R26oNyzjpTqpWiHf22fDcJh5z64gh0Tx96YrnEPrOaNPERIbTx6 YsVBGMBiRezQGtbkxcMYEs4IF+vBl9uIJMK3D7dnBx2SCeDEkjpuLgi8DXdtHyph8WyL KmMA== X-Gm-Message-State: AAQBX9f0rwJzUYzwvwBV2RS521amkrD7J4hASBi1PJKdbXOu5LvaJ/BB An1ffwAqRBbUo+EYN4q/rkU32A== X-Google-Smtp-Source: AKy350ZfhQmTsVjWSSkNdrmfeWoP+w6CU2sdxSf+zlZBnBd3DIyE6NNnISJz8v358g87ZS2LcR27eQ== X-Received: by 2002:a05:6a00:2d20:b0:634:7ba3:d142 with SMTP id fa32-20020a056a002d2000b006347ba3d142mr24767709pfb.10.1682420750817; Tue, 25 Apr 2023 04:05:50 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:50 -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 8/9] maple_tree: Remove the redundant check of mas->offset in mas_empty_area/area_rev() Date: Tue, 25 Apr 2023 19:05:10 +0800 Message-Id: <20230425110511.11680-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CFC2520029 X-Stat-Signature: 8wew6378bc36ssfs7mc3cf3pco4hdry4 X-HE-Tag: 1682420751-726862 X-HE-Meta: U2FsdGVkX1+s5hQTgkHx4sYg968bYsqN7rn+ilxEt07/0DQnNKLq8669Qh9jxOEE1ufuB0M+IxS8tihIhXjRzj6xikVAOuueYuzMLbAO/btjnnq0TO+KsUYe1HTLD4fIy6InOJNSrAQN6+3O5k1O98CPCW/5m9Mz6MYpUuKsuu3+YSpWl49tpMBaDu94NNplnIVSdwt1acTrlCptgmOJvio5rLSwwOaK7uimwYe+AxLQBFVFkOoTKNLhT9KyBdfMt3Z7M2wMYgviIKS/mX/y7Fv8V5QkjkInBjEMGy17EcujdCP3NWYbryFkGj1y/UiabvaUMw25AIZ1aNhW+DD9/57QZSMtg54CVAKIkqNMKo+I6BTuNYR1hj8uVOikL/+E//euBmmSQng81RbrzSQ3TLDekBxGMQ8MAppNrkKunp6to/AXmIOI70Vp/akQh+E6ebnXeHYJIxIp32mNPFaK9P/hSusk+z0wLjk6n7FWhF/SgaaUBwIoyhzctJ8sO8hbieq4/G3EiOSyuDA4ikMZ3CTBBJnXSJb3VAMzHE/7LjZGYKipVV56AL2C8VO/Gveq21yVOZjxibKL8Po5W1KvCfIdyi8jgH0DdBgfFQNKlhbgpRHOXuIrkA0/19DGWZuyozp5dWHpDIlSCcERQCvzXCgZLqUzKD++HFMpaA1b4zJWvJfCq/94o7J8ZFXwbdcqXISo122bHXZ9LrL/4GZsBxo25yW2QZiEbw6FXHYYsRf7q1KJnCBMsKNRG/AkWLqYDKmJUFsldB/lUqlRWoqxCpFZIcNcz2LJ5WrrPiPwMYJAWJkvrQ7O3zEcwHFtq/8ftMN4RzM5k/a094DVfAWddwTdMhvDKUFk96RZvc+cWDnqxQcqPb9qwXpAW4zBDxWvWWcyu9reEO5VYW+mQM23hor24Cq1eqaTlKZWc2jiy+wOzDvwxO5iFBtOMV9qV7bXwYBu0bUvtpYMuG7mk2m qH1aEDN2 181K/sMlk4VFo1TkLqfqxfFesraVBTT1XptwzusrnyJ+nvZm3a00qKvxBj0sdBfc6TOkAuQVI8yTn+UVKFyYv3b12owUpdRTvYw7TfGDo53TXDI5EiB30HXiSq2T83ZokhTyNVFsu+Vhqrzj/2qTnALzrKTHbKUDINepY2gap29r6+nXGhZSYmVuqB/PTWpBZtT02ur1CK87G6xokhl3xo2W53A7K7As23h8oc8k4G1ykY/cdUUu2hmUtaCfc831JvFKnOfeITqm2vlGCptKqQHmTs0UNmBGDrueVazrbSuHzfnbkTi6VYJAoJ4TMA/2V3/6w2KKvRA/OE+FYR7j87Kw0ibQ+wj/zr3+Ot93v0gVAsmvILsVp6D5YeqElTkbT2KZEAOKstR08j2AwbovBZa1SqTOouqxQPfi1meKDjzaOn9XZHFdzoYy8gK4z40ZNg8h460dD4qD7wEU= 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: In mas_empty_area(), after mas_awalk() returns, if EBUSY is not set, then mas->offset must be valid, no need to check. Same in mas_empty_area_rev(), so delete it. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 8bfa837b7b752..964214de2ed18 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5305,13 +5305,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min, return xa_err(mas->node); offset = mas->offset; - if (unlikely(offset == MAPLE_NODE_SLOTS)) - return -EBUSY; - mt = mte_node_type(mas->node); pivots = ma_pivots(mas_mn(mas), mt); mas->index = max(mas->index, mas_safe_min(mas, pivots, offset)); - mas->last = mas->index + size - 1; return 0; } @@ -5365,9 +5361,6 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min, if (mas_is_err(mas)) return xa_err(mas->node); - if (unlikely(mas->offset == MAPLE_NODE_SLOTS)) - return -EBUSY; - /* Trim the upper limit to the max. */ if (max < mas->last) mas->last = max;