From patchwork Wed May 17 08:58:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13244468 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 B6880C77B75 for ; Wed, 17 May 2023 08:59:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B50A280005; Wed, 17 May 2023 04:59:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 565C7280001; Wed, 17 May 2023 04:59:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42CF6280005; Wed, 17 May 2023 04:59:04 -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 3736F280001 for ; Wed, 17 May 2023 04:59:04 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B5FCE1604A0 for ; Wed, 17 May 2023 08:59:03 +0000 (UTC) X-FDA: 80799147366.04.3D3AE2C Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by imf13.hostedemail.com (Postfix) with ESMTP id D660120008 for ; Wed, 17 May 2023 08:59:01 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=hhZrHVT2; spf=pass (imf13.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.180 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=1684313941; 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=DxGBvrxxE77Ame9f1Z/CNikWB0RCA3Ncw948p+DNd2w=; b=SXcOC81A+PA+RkdKSwjOzT9MjsehWtEyHXPvvzlvviBH1Yxj8zgskN8lVpSqgGWudHxZnw +3mK9E6T+SZmge0w26xCr19SBETSuFhHxjhB6iyjPu0mDqbkChWpgaLMxoPqUfnE8oC75U WczXqyXqleLR5RCeMXWqNkZK7ECAiEc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684313941; a=rsa-sha256; cv=none; b=v/BknGPQ+jnXyGG4W5h8Ioln/qCe4Y6s9a92Hqvj9SWQbRL+8Gt5KPw4R8mF4aIeDc1FHc c/kg6qupyFkvzo5bh5B1NQBBsOESDUC235To2kbiSqmpMc8Pr6ShSMhOGkJRczaOxuzJgC ENISNIM6z3oXw51HEdM190RetNdhhJ0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=hhZrHVT2; spf=pass (imf13.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5304913530fso446443a12.0 for ; Wed, 17 May 2023 01:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313940; x=1686905940; 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=DxGBvrxxE77Ame9f1Z/CNikWB0RCA3Ncw948p+DNd2w=; b=hhZrHVT2VkGePkTiFFK4sSJd8tqamGMy8odrTM0tq7wmPGJpAVOC0d1on3Km9zXhzT y8D2OMuQprZsBQ1bkis77HuCjfKIWwbuujAGqKb6WVCab0myyW1TjTLmBulCtJRtb9++ 2nB5U1ur2jcEfvhed4ojCjG7XmkcUqePqFrzix4mfSpruFIr1e8Mm9LUOi4pYiwjBsVG Pb5fkZ6DlRSwVN5ADq+nQsZbVmfD4u/sXOD5KDkFqXds9wgkLdi9ywBUFX9W9V7yLQSP PcvmydPGz6L3A3m5f1hb1GPVXqXcyqapyMDTTKZwica43fM2ZzRKYIb2sGKWzoOhUc6X YQuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313940; x=1686905940; 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=DxGBvrxxE77Ame9f1Z/CNikWB0RCA3Ncw948p+DNd2w=; b=APjihKVcFTMpW9q9D6F4NfGIyfULemBTC7Ba+/E6L8NIJaXtnG02IBokHyRHe41F/A aTMxDxig5zEC3sldYE0RRhMjTtM1+t+3K2afa+BG98YRsi7eIbI09KFBH0DyubRFwwJ4 VVztvL56pxjU8kBAQrFMO5gNHpXvJXd5A3mqFCmTFaFCh96xqd9JkS+lLErTRgS+3wvE +xtZFe3eLAQ0k3x61nUMKMybXAHPTowZJkNhAcIwPQgAXBQNHz/5ngok5uwkebSjMVh1 R/nLx9NSs/bSG0xT++G8EwXLcsDsQaVbevM/fqCl3+7QGZKu1XlHFm0tNXqVJAtwZvwk eYeA== X-Gm-Message-State: AC+VfDxXTMFA0+QYub4bFGdi6vVmNVNPTrGUCMRhP8K2zvdWObiPDPIV QZdTqDE6hBKa7EVE3UPr0sFXwHgBmZ+bpzTo6vI= X-Google-Smtp-Source: ACHHUZ4e152x5dK9Z0TzZC1Vveb2UGWQnunzngonUT+kThkHDvgyajgacA18i4gRmC54ibhcq0RIZA== X-Received: by 2002:a05:6a20:244b:b0:100:a9e3:17d4 with SMTP id t11-20020a056a20244b00b00100a9e317d4mr40707827pzc.0.1684313940513; Wed, 17 May 2023 01:59:00 -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.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:59:00 -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 05/10] maple_tree: Make the code symmetrical in mas_wr_extend_null() Date: Wed, 17 May 2023 16:58:04 +0800 Message-Id: <20230517085809.86522-6-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-Stat-Signature: 1ygt5umdwyezewjrr5ccb4kbzbgahkym X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: D660120008 X-HE-Tag: 1684313941-801669 X-HE-Meta: U2FsdGVkX1/vZ1pg0/eRa0Mb0z8HTYA2l15boxrU8g4moLfuOxdOsLAOjX/q1hvIMf+qjYYat4GgcLuHtt52ikxzVRZWSlbTk206e9z45qbbg3p+m6EgB3Ofo4lZFUG9nRSdoWVB7PuxcT4t07vTYGzwwV4wI2magLE2oj6lVOaNidWXdKcFLdNzggnGar1ATxvMFIclSE6wtwO1a8yNM63ggXmkkZvRh69jxIuyc6dM479aFE5X5u9DZSFrXm0y2m9R3vM1a/KhFYqnWeQlNMe6DDFvd5plwjalDNgHc8uzPALAs5V5GDAZD0hsHaz6NfroIrR8VCHtb/w95dA4E63QiJm6A+ruOJAG4SqCtH5bvtHLn5DPbR8jmxUA9pWotnYm1x5IsLsY8/QloxvVKt/JkvnOXX/WNoQY/Ia+4GWCYGqF0Zarx8+0E7fshtpQlJXxH+saOGL8gArV05uFHZ8LaZD12EQeHHm1RRNcA3cGV5zptO8z5P5IWNTyQ1RvBVCtYxIh01EIobXocrSleTreTnrR7uprGuM9J4upj78X7Z+SbssWYdcJLn7Vh+jCz6Y7rjElam56S+QZGheKU7YHAGSYUMy155+Wdiy5Vpk1aiwwE9ejaRwuoYbJrqpkoVJkq+MESYUBe2MzOyfhdH9nUkgoSwZqhvfOkSoy64iXqjISjL42zdkGk405jooVmd/YJ5BNMUWW84fDPWx7NSwytOwd6KSlMas5MCBKA6iMTIR6IMb6BZKhML/YPmFUbcsgUSo1BYIGUPs5/G9x5S2cOZ6tsu7gnh54hkvIu10ABwOI6FTtE6mMnv6zDRp2w1mk3lY6RkrhJXJSNEQWUaYKLA1OFOfEjIdZM7WiAtDUT9lR8Qx/O/9TuUaAMLbMUHkP1WPc/o4/ViM8xUqRnM7Lpr8iZRCaXBoRu0FfdkG3zn1hIyH8RhN6AigspRpe2UaByRG79nwPIqc2Nbf 0KYJxAYo bUuztG5UjYO4YOBBTPUGL3xoyGpxrjA51ZWMSVZgA5YYsxXOcJDwCYYVxWMKFS1e28ZsXvJXmitPY+90kEfXn72KhrsNzIO9bTLg+YPGNWEPfPUThkXF3e7Vvsn/OsldepWQYSucbCqFmJnWbXn/NvqLpZ087uHW5xHxGlkSoF9IufiOJbwulm/X4w+S9eWHlfHBVU5NHEqPgp0SvC54bfX5pXmHQ8rvR2mikqECt34OtGXFttkU7LLjx6G0nEIGje2tMFdsshi5A26+/gkYKMuZKg+xPnSbUORG0pw03ziZoRxS8oI+FdO+r7V9xU7PtUK5A0LdojrVyD9RCIDD1cd6ShdgOjp9hZyf2AbwCZojR7S4XjIkJszJzJk6Kp9havhmeDpeFl6VrsNnDs0v4uCfZTyDNXeccVGh+LPcQsjEq02JKVhmmZ+0ulUBgo9YlOi0LfnPBX28r6pUiRA6ushx4KH6fS01+pAwS 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 82dccc660889..f881bce1a9f6 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4262,19 +4262,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) {