From patchwork Mon May 22 05:06:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13249770 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 E15FEC77B73 for ; Mon, 22 May 2023 05:07:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 825DF90000B; Mon, 22 May 2023 01:07:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D68D900002; Mon, 22 May 2023 01:07:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C5E590000B; Mon, 22 May 2023 01:07:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5D3B9900002 for ; Mon, 22 May 2023 01:07:36 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2DDD3160462 for ; Mon, 22 May 2023 05:07:36 +0000 (UTC) X-FDA: 80816708112.03.2D3BE78 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf25.hostedemail.com (Postfix) with ESMTP id 584F2A000A for ; Mon, 22 May 2023 05:07:34 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZSCKQFXL; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.173 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=1684732054; 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=eo5rcY2cJVWJgq5aXNebmW2HhW0q7JfmSI/nM1R46gk=; b=ab/6gy1HFqw9gBypdzICr8ms/N0mRRDwj3gCMdsV8mhCapMmbbjeQSsIzeCIA5Z4XyBbsu 1MeGbA5FxQ7qGah3TP8IM3maywjxoyebLcKlurJrt78y4Zf7ao94RmaUlK2d54q41vH8In 6hXhouoEzLJjLO9xviCCg0ObXYi7ahU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZSCKQFXL; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684732054; a=rsa-sha256; cv=none; b=s8xj5GJbKsaaiuZ9APombOUESQ9VgLHQB7UBsqyFp1PTOeC//xuFDFGQZPEdA7/JJTraNv C2/imWopoZfOdZAfMTDSqKPIl1e5r/0LfyrqWdc3QmLZDnKCKmc0Q/G5b/px3FWLzhCfLZ aQ+JeWJYzMeiwAiIHbPnvlffhwuIZo0= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-64d30ab1ef2so2133537b3a.2 for ; Sun, 21 May 2023 22:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684732053; x=1687324053; 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=eo5rcY2cJVWJgq5aXNebmW2HhW0q7JfmSI/nM1R46gk=; b=ZSCKQFXLVBYNVkVOOzDNCt0Mcj4KMH0eT5hciFj/maxy7uR2Fkn3XI9lMlN5I5K2mq Gkw8OaXA1zC3gwyZmCX2kCRi6LHedI7vC7pGlQ/tq/vEkC3qx84ASPAf41r2VFRD1XBm Qq35xPIr91V1EpeXuEklHJyGwYOOSZuXcKpt7zcnKzZgmUmXG7hRA8dpYUo1ZjYK6p9J f/UBHZMxPM3XmWhjiUvQ3km319KaunvQEQg7Wos7iycBYkWIlOSSwDwri3+W/KsmllFu OfpLB1SibWVW3lTR6xYe6IJvXPIhv0Nt/Z5NcrMSHbdAEZqqBED9UAwJNrLOiZY7L84J F0vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684732053; x=1687324053; 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=eo5rcY2cJVWJgq5aXNebmW2HhW0q7JfmSI/nM1R46gk=; b=MavUUnTHy94oDQtxrkoywqkhziS+xKFi2o5IDPb2aDFSmlPvsXDPvPlle146fFy+ln 5wZsHd7zRMrxMUwgZq9tTQuPBL0zJXAZh/S1zJLynM97135xlB4DDTLXlJFB97IaDlH+ FaTW30zjFX6kIr6h+dlUTFPrKulJHRJvN5LroY15XHmDC61MVtO2Vmj4wg0KtqDtRHJy GEz05F+wtC15SUsZBSA0oKPLZt1r90OmL1eQmdDOWJdCXdpXkcJxIhxl4yxCKbJYYSPg eXj5jFGGzK/On8UIcg3op3It3iujqPezU8GXS/t9Bpa4i6689/JTMM5XbfwgjnIVblfG cZ4Q== X-Gm-Message-State: AC+VfDwtqp2cQw4m/GjQNotZ8jxCCxW4csoy//Dj7VUhIuxhpfI8z33s Zqjc6CM7ms3Pb17JT0sboZlFOQ== X-Google-Smtp-Source: ACHHUZ4MzY2LZNzu/pNjw410E/5PK7X/ZtRiKyw0Xmd7JdlNmnRSaFHeU1cNLXN3WvcR/RrqWRLy2A== X-Received: by 2002:a05:6a00:9a4:b0:64d:2e8a:4ccb with SMTP id u36-20020a056a0009a400b0064d2e8a4ccbmr13674329pfg.14.1684732053316; Sun, 21 May 2023 22:07:33 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id t10-20020a62ea0a000000b0063b5776b073sm3247519pfh.117.2023.05.21.22.07.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 21 May 2023 22:07: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 v3 05/10] maple_tree: Make the code symmetrical in mas_wr_extend_null() Date: Mon, 22 May 2023 13:06:51 +0800 Message-Id: <20230522050656.96215-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230522050656.96215-1-zhangpeng.00@bytedance.com> References: <20230522050656.96215-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 584F2A000A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 8oqupijdwa69q9w3g1nw6gbg8yk5uu4a X-HE-Tag: 1684732054-910854 X-HE-Meta: U2FsdGVkX185T+C5gxlhErK1C0AH/FK/coDIKFvSPCV/upH4l3yLi169sSEkOfiGHQYwGmk0mJ+CDQvD+OWe3hjWmhQMkuKR/uiTNqpvUlMjazKc+yvrZK2a1ZCIu9VIwHuIDqBZsnOQwJQDnUSgnSZEegwj2r1FxGll+44XSyc0xAX9Mo9KRmZx6lqzH+EaxIoircWwsM/FnQPYQAb+f8fHVlBn8WkGQrHMt53Wap9c1h32hTsY08SrJ8jh8d/Ir8jgfGD68kFMiTaFd2qXwB5qGOvuvj7WUm11N4gsf3mYbT2gcU3Opv1bRgNQNViTVRy/tt6gAU3RpZBfUl7OxhzKlltw5rLOR7a1DyfDnSv4czNjW5MHn6lUYCaQsJYAkpl/0PNwk5g3vvfPrFwjZajfA/ABoIH82qOXK9f3IJrbkPFxRBCvAxz1BQx26so5czPqNFy88ZVPjlPPyjsTIqyBl8b2pMO5xZ4Z7VIHyUui/QlfBJHKAgtvqJ8F3vK3lYGFtkQ1B0g0vZx/wfdHK/OGs5fpAk/gs4Ql3onNWgBK8WxtOPaUrratg5r+I3ZU6CMpPBbPKo82mBVrMrZVp6WZ3EJ3cSfCKJNPmTki4KjhjLVOnrOQ8e3duYHPvp3aJgjaShJOEnXF9r3JNnxEcJ9Oi4ur40BR/BId9/q+8cBB1Ap54EJgOei5lUNE3hl8UX+F/x3/JHaPSE2Eh/61oPDwUY3iJ39jATmChggyk+cWxyksOUS/OG+DPETnbr7pLHqA9o3R4yn2NKP8upFhWzzDBFBR0Vgxy0GdUcJo0WWKPGlBaryjHfTjyBqAebNIue20o/fTcWJ3hvZQ1rcb+ce/g3a0ttL8PsS5khnVAcCjqF6rAJqZJBdtBFzj/bCYMCs5dDOAbiV3sybUfhuIyVD2ujeoP5tvZGddeRVmT8U2+VLIrm0P+s0uOi2L1l8CTqOD2qXql/cp8WSkLuT MnPtYdh2 DPSHbgcwo6oMEZSFTgbfzV+utDc4aq8aSXe+8QJ8kRhMz2CCEoI6YFubKKhEdipbhan9EfS5XcnF1jpJJQeOzmiTuukUKrjUq8JmDqNxa/6M0LUPvJiEnFr9k3tqm20bJ2GH2nK0k3zUB8F9Z0pYRTTURnjnUgBPBZ1P/Jtx7UsT5iiu/B0KNdyiQG2En/wyoqWF2ltzHK8lUU+4HghqavX9hn5LH0X+sPomNLg6dpWdVX3xrnm8UFkTb+ZhBm+LbBTRXZyIGKCNiAKu8+JlB0fo3HglUgfLzeMS0X45bK1BK3OVdJh2KMlSuJeNXj9QrIjHipA5Bt5hSm435SvdDpV+ns79tITwyHz5/krpkJZRKJQnFqhH3l5JzfOUaEkwBsRA1sOodbFlYcAeYxGWPGLFeoNBtvJPDNKi67pbWC9iTFUUwx9a02rRSNeGHvak9+GkpcyyxxqPHR82iP7BMT2rj7LElEgP7G+GR 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 c47af84047a4..562507979a4b 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4265,19 +4265,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) {