From patchwork Wed May 24 03:12:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13253238 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 46B81C7EE29 for ; Wed, 24 May 2023 03:13:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D913E280008; Tue, 23 May 2023 23:13:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1A65280001; Tue, 23 May 2023 23:13:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B93D7280008; Tue, 23 May 2023 23:13:31 -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 A70D9280001 for ; Tue, 23 May 2023 23:13:31 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1B4B4140888 for ; Wed, 24 May 2023 03:13:31 +0000 (UTC) X-FDA: 80823678222.26.8240491 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf04.hostedemail.com (Postfix) with ESMTP id 43CD440010 for ; Wed, 24 May 2023 03:13:28 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=kvoX8rfQ; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf04.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 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=1684898008; 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=ho+8AxwCMUO1UZDPlZ+RxzprWSmT0wiRibYRYtQid4k=; b=GEUjzY45JsCFG03+s4pw7uz6AuwRyMBgE1qCP6cX3Uw7AHE6I1yfbZhJ8Hlekb+Un3nn34 q5XJbDDujU9qsFJAydcS+fJVfvZhKanU12J42zw2pPSTiZ7xE8hZrwZJP0eAlD0KPGisxb sC+Pp/dktrlWwBLS1QGJnYa0EZbyjRg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=kvoX8rfQ; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf04.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684898008; a=rsa-sha256; cv=none; b=cfG2IytDEhQhLOTXFrfifsRqLTPMo4itvKgf1cWjDzHMO9fQFkIpBjTa0qCsaoQTqJTIOe 8986Yea9deT2XBzcn/xi94nWY+DqKr3Nuka72A8yI7XfcXJKMhsocPPl8pneKanydRZS1/ ViupRO9NNmTxnHG+e7PfdX4X1sgLOjE= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ae615d5018so3668745ad.1 for ; Tue, 23 May 2023 20:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684898007; x=1687490007; 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=ho+8AxwCMUO1UZDPlZ+RxzprWSmT0wiRibYRYtQid4k=; b=kvoX8rfQyN2AB0Gr43+8rZLVHFEmrrDTqutZAx5YmjW/kGuQGJ0PYvltnv5oe+C2Dz 5qJCza00ybILWo0O75SnzamE/deaG5NaRNh5OG1IFwsc87i9gFW9INu037TjJF1yAJNr iKqeDs5Fp+AscJaCq4eKX+NBdfovr1pTO1C+zYi0UA+vOAW7Uvs4emRsWyygLkp27mAF Fbpqj8PxnSGvAO2m8iSuM2zxRZIZL0nARH7uV4WpbZ5mrUUSxTHDwmBAevUUz6oEWcPc IrnFnja7kLA1sl5ZZz0CUVqI6joBnhibcFuTnaVKHI+e0tnVt9HoS5U4VDbwvQOLyBDy AVAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684898007; x=1687490007; 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=ho+8AxwCMUO1UZDPlZ+RxzprWSmT0wiRibYRYtQid4k=; b=DYh1M4j4GlCziTO54zgnotn++fPdMCUTSnn08yqRE1VWmge1PTsmh2/Y3oiQpEtHK2 Q1kpPotiu0ndDrS96arPKG8VGpomELjued2qtDlLhaBJFegYN+ER0QCZllPshphZOZrI ualbeBIUSf6DoN/tF1JEDwBT97BbDM4wdQ+6A9l92ysX1Oa7X4i4HvtxqKP674fRz9eD 9ttT31mTjn8O8gG5QKbwkfWtkjCXPXSIEZWbCGWV40M+kjMkpyccQwW40QV5VDyiZv4A ha5zkWCLRNkb0qTJk4vtMIlEMRHgz9d+fWevM3vPCa8ORNbAQRzvv9pTlMXpg/9ttAIF fNsA== X-Gm-Message-State: AC+VfDx8coONUBS73xsk1C3stof5ajudMiUZLONhHHgLXZUxRGA3xaeA VaxGvtp2xKR/mM+uobeK0SdkbQ== X-Google-Smtp-Source: ACHHUZ7oy2RxbbH2OVgkUE1oxd5jsYJ5LwKzXtkdSfTzpZc/wJao3zk8Xe6ywUfA6Pp9flLwKPR0+w== X-Received: by 2002:a17:903:2287:b0:1ad:b5f4:dfd5 with SMTP id b7-20020a170903228700b001adb5f4dfd5mr19242735plh.32.1684898007229; Tue, 23 May 2023 20:13:27 -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.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 20:13:27 -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 05/10] maple_tree: Make the code symmetrical in mas_wr_extend_null() Date: Wed, 24 May 2023 11:12:42 +0800 Message-Id: <20230524031247.65949-6-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 X-Rspamd-Queue-Id: 43CD440010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: s5re8mmcyeyosajuqb3rj8pwn4xmmxu4 X-HE-Tag: 1684898008-69370 X-HE-Meta: U2FsdGVkX19wqkcxOFY+xLfrfe8ixFnC1eLt/9OSnvLqLfEtBS38C0dCBR69jlAnxhCCS+Q/nZs5JbPvRYVYAwx/g1/DWC2zElV0rI1sukx2ZKsa4AhU9JF/IsaoA/DHJOxhiUNpuEvjTQdDZHmA2iiB9koquaImttQEMd4Kf3O3iZIrtrkaD5fncVyeB4ZvZietZVb/+iMyezjfvCANvwonY8ti8UTm1fWSMZxtNhE4YJjY65wsPEbXhMDuvSNwkakIhHx5axRg2bFUZFjS+7JMVo4dRY1cnilLqLTM4ZN/r1BKi0cjaG7zwqPojNrzaJ6FHA0WDIpHAGOi3wxg7V37/s8rrFHP0ql7g0gcM/0PIpG7h7ZgNUxgy8M3u+BI9EbXaqqDNCDCkThgCd3FCfUTpbgwT0MnIYMIXDKuv5DBO9hHGyVZSgTUgasW333vj20+KU/kOIsuFFTSJSBb4Y8A2Arfh3pE82mwl5rcrsY9a6xNlrNLD9EXl/C9NSxQVZtLtpAgBoghI6UFNwTsqX2wwSCcQpgo8tm08jexIW5fPLi3S/NDsVq1OGno9kv+MUj57kyPZs8HflcCH/ja5J6ABYm9mBqDI9WZToWcncc7xuw2YUkJY2FDQ/v5LZsYHQMtbTAFzjNwv2zhbVmTkrdyc/R1imM4oshWFafvjq20H8GKlS8J8Xm2mNueKprpH2zoPyovJBYKijepu4n8cyS1j4LslSOrFPHGCX0olvMXmOH922G56SpblV94y/dVXfox26vTUFFKElLyJpd5FgfWC7x0pZiZcChhKY50FTj4wNGDIrXyg6R7A7Aqe8jr3nQ0ZvjecIzNT1cBlank++Gi7YutJUd3XpatmykkMg3wEk7w0mSEYdS8J8vcQp0FRYZrGYNaIXOvrE1wmH4ow6Z/8vAN5sXNh8YhesaI0XfwY/itQfbAX4JIhKJa6DQqZsNGG3Qiot6vVX+acw8 jBI5/CCF YPIBI2x/FCJ3MP8IuPssKnkuxv0QfLkNVC2J0WAWQml5lYb5Rpks+MFM987KnyZSbM1YbXNsH/7WWVMswLJqVsLR1fjnc0li1qiThz7fG1vyfjntz/tTveb/0vo1LxZD37v80DsT6aS3MN/b1J+ul/bcEQkiZy6rIYwzA8Vv9weS3id3H0YAPWXZutd8L9jdMkLq7pwk6ovGF9G1tUoZVmoEWYNFjhnT4YjPJkfVdYrG2I2HZlPtBBeQX2h/oBM5XO9yZ2tDQFE/eQ0wdHnEFbpIIKKv4VZ2k0B4om0AprDcac6uwc8I1aNWU6ztFP8q0ha/zMLwlW1vBZHNL4VXv4d8Umn/v3hkGmGn2bGCnUHI2eW/y+0z7UZSTcVGAKQ/7FtMGDs34lyRd5JSdDR1okNWUo5YWAYOB9Ybt6zG9T0FBbxa2dFoSRKHeYmGWa5FNlO5J2rOY8Z4hRziiqKCk53F2ZQjXWq9c0U8D 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: Just make the code symmetrical to improve readability. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 41a105e76e22..e6e42e1ba44c 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4264,19 +4264,21 @@ static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas) { struct ma_state *mas = wr_mas->mas; - if (mas->last < wr_mas->end_piv && !wr_mas->slots[wr_mas->offset_end]) + if (!wr_mas->slots[wr_mas->offset_end]) { + /* If this one is null, the next and prev are not */ mas->last = wr_mas->end_piv; - - /* Check next slot(s) if we are overwriting the end */ - if ((mas->last == wr_mas->end_piv) && - (wr_mas->node_end != wr_mas->offset_end) && - !wr_mas->slots[wr_mas->offset_end + 1]) { - wr_mas->offset_end++; - if (wr_mas->offset_end == wr_mas->node_end) - mas->last = mas->max; - else - mas->last = wr_mas->pivots[wr_mas->offset_end]; - wr_mas->end_piv = mas->last; + } else { + /* Check next slot(s) if we are overwriting the end */ + if ((mas->last == wr_mas->end_piv) && + (wr_mas->node_end != wr_mas->offset_end) && + !wr_mas->slots[wr_mas->offset_end + 1]) { + wr_mas->offset_end++; + if (wr_mas->offset_end == wr_mas->node_end) + mas->last = mas->max; + else + mas->last = wr_mas->pivots[wr_mas->offset_end]; + wr_mas->end_piv = mas->last; + } } if (!wr_mas->content) {