From patchwork Mon May 15 13:17:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13241440 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 0059EC7EE2C for ; Mon, 15 May 2023 13:18:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91546280005; Mon, 15 May 2023 09:18:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C5B4280001; Mon, 15 May 2023 09:18:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B46D280005; Mon, 15 May 2023 09:18:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 64313280001 for ; Mon, 15 May 2023 09:18:42 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 274741C8853 for ; Mon, 15 May 2023 13:18:42 +0000 (UTC) X-FDA: 80792544084.26.F532F2C Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf22.hostedemail.com (Postfix) with ESMTP id 475BAC0012 for ; Mon, 15 May 2023 13:18:40 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RXRsj1EZ; spf=pass (imf22.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.41 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=1684156720; 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=sHW4PAZciOvQN8kO9ncypAlcJrM+C64frREEyy2mYLs=; b=Hy+yJ8Xw34zusxvgNp+v8z4gISLuDore7i2uKk22amPvy0Fi1CUqBApVe1jz+3hH+dCPv5 lLvo3aVt8ISjd9SHTjyob25+PmT/qiBlBh55Ohc8NVku5k9zJ5WmUPz4CCibedKGtsxO8N dHs1ZvTMAPkOD5x65OAv+ycpJXByTno= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156720; a=rsa-sha256; cv=none; b=0a/A8NjJb+QXQnGucJtg601IbnRxQXF9qt3sTV6N+T/kigkWM9Tr1UiY1ZzsjlQkHXYAuY vKn14ekhdBw7TRB50gAFrmxuQm12HHnx4Hsv0MyiVuoqOx+86Dt79yVvrg8dqorClF7IFa Erz00HQ1WZBN1uhgrrAtqPs2ZLvGpeQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RXRsj1EZ; spf=pass (imf22.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.41 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-24e4f674356so11420730a91.3 for ; Mon, 15 May 2023 06:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156719; x=1686748719; 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=sHW4PAZciOvQN8kO9ncypAlcJrM+C64frREEyy2mYLs=; b=RXRsj1EZsY6H5AtAWlNnNwgRH9USWx7rFebmnNSxWVp7B1o8CDstfKLsgde6nsABW+ pMXRGo37YS/kX6dHNMteA59tSoCGxbUBLZ6cO6Wq1ucLmJE1mXUSHZL5qT97ZRlk+fbJ YgjpDtflzI7axWqu49cUqsNwfPNMCiyD3qq/tywbO7P5f/mCdDy0qhzolJj52EcCpGAr GKc9dC3OBrqikC20SzF+ImqrLV8XP+pqYgT4oug34pP7t7GokRQqeHLdEQLgrABz7mAS Fw+7+talhdXjs4z04CsjkXHbdEZEdD1QbNbIUtQaIk+BveA94b6E915qmJKJ6sFUuUS/ qcvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156719; x=1686748719; 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=sHW4PAZciOvQN8kO9ncypAlcJrM+C64frREEyy2mYLs=; b=Qmz05Jj132HrxLqDgLPCBIHEH49ATMvdeOyElXS1N010yNQybHs+X2+jp/JqszVhOm jPv+HfCm+UoS78NueQP74tHnLoZifDHAG6U96S5bE19GQ9b8p286NKZr9FhXpeyucIvE OzSsYwbixUVt0E8imNWMhQKdpXyWccvcqqofy9n4EEOsFkZ3nXlonS6sri9eqyfd/zqF WxTAM82KoFZ/HOyAbHsIWZwPnOf6UtPuOmVHtzhtfu3MG+NcPzzJlbXjxwRBi6U1zgrZ ckdB3sQv5FTON8W7nSHqll1povc+D+wRLyunowlT/hnJyIMyu4M0G1ewriFyyfjUsPM+ AQbg== X-Gm-Message-State: AC+VfDxBE1kai97Vo3QG1wxgq9nwzSvC+daU/7RYE+7QIf2wYk0hEFbT HCBF4F/Se568T3WMmsWzxCqF+Q== X-Google-Smtp-Source: ACHHUZ7OPPdtpNM7SISNyCX81ZSswrdvwKVdZipovJWKD+wJP3pDOfgQHFOEVjljfMa+hOjEX6q3Ig== X-Received: by 2002:a17:90b:3e81:b0:252:a0dc:7950 with SMTP id rj1-20020a17090b3e8100b00252a0dc7950mr13256790pjb.2.1684156719239; Mon, 15 May 2023 06:18:39 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id gl20-20020a17090b121400b0024749e7321bsm14190014pjb.6.2023.05.15.06.18.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18:39 -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 05/10] maple_tree: Make the code symmetrical in mas_wr_extend_null() Date: Mon, 15 May 2023 21:17:52 +0800 Message-Id: <20230515131757.60035-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230515131757.60035-1-zhangpeng.00@bytedance.com> References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 475BAC0012 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: dfiur7e3iqo7ynsja5umaw6h5mbwmdzp X-HE-Tag: 1684156720-951189 X-HE-Meta: U2FsdGVkX19IHMA0OyXhBv3uetfklPv+8ifdMF7pZFFqyvYt5DTS2N5cLjXe9gbfCVQy+m71INKbptr/snf4YT/pOtJdgBA/GLWLw3JpmL7oofS9bfRB5CYm5hXArxyjZcrqh7jStxupYWjlm7ZATLQj7y3HUV29iuZ+nlfvXvQ5w9riZHU4x3E/kKJqHG2EqgNY3kY64kmn966dm0oK+da2h7KAQpW6Pf3XX36VWS+VmV7eEzJisx+yENLfQvBthfI82D1Z5t3wo0SNEqF60y+c3TbGxNqbVaOV047u1sUnPWB99LIk4h8Khjm4hnxXbdEwN/K+yBLHqFghmqppRsAX4qQurwFVt2GQZzCI1Sm9/wKta47TT6ycR709d5+hZGB5bvSfBTV21JKJ6bZukTQ37ge8lafcat4OXa3c5Iz/TpSCJ6CdyBoBMirWTsZtmtWqBY6d4dUveNemWJ8g8p+/VO3+4/tE4stIP/DHRbXOwPQ7184GX6nlisK9XrD86rlm16ajp0MOlPBQKET7jexsb9brhUelNPMXzSwq5BTWHsHgmtIJxIUWO21VyErT0sCFRxZKaZnmy0CHfIoHzojoBm9EtIDGpQCgGCvUO6zLkZZ1S6V/BX+AHtTG0rXzLcf7Xi3ExnD2HrWLBOSK46no0O7Q7S2NP0w+CX6ug7Wxqby+WBIy+HSpVUIaNkmL/Eai/V7Vzf60is9YsmzDoTArL9BonJx6ewkdYU/iPmSBM3boFfsh1vWLMUnev6GlqomyehOuBE05HhLudrH8J2yXqAy2rd4P1HurqD0NycwcC61SDYapAI0JsO+H6o1/4yUMG7qpq9Mc4UYLuzX0MoKx8VA9hjREY41HZo9ROaURNDZznqzOp/wNX5kqzOvpzIMMX5blBa8zOZlUiygYEnQnkDaPlei4cuYzQdbgSxWvumkSUTV0WVmvlPvYkHrIyzfGAt1lmNBwyPVo2gJ l4NFdqeq 9oCk864NrtZZSJgedSUqbtoW2eusQQrqSlThIOR20EsXZcltNHOYjmCil8go+y4WhaaZbJbrjB2+p8WLPsEemCPtVFY8WFpYuWhtf7cx6IA+WWX7qIMFNalGxuoskH/dGr9T4k/NKKL0I2mecvyveLVSyWS7s21kgPR/4kzSkMHEPwPPYJ/uDk0FDxPgenFYi8tcntLagmG+61bTF0HqHl/yXAUfnZjrS+phMs05oD28nCSZMNfVUOTvjA+gF1FKnai9QZMqfAhH6GEqJYVAD/8lQwyUT0Vfz1ISXURSt3HKUZFjp/gqI4hjz2GylBzfOUyzuFSa915aPNpRyVVLoDNAf0PITLWHJpnNJePKd7yW7aWMluEZNZh/8iC6r0DgIJJz570mNiI8HKgUpwgRGCncJqKoadWX3GhR67i6yoPMvZ5Xmyy04pCbNzGwiI+8rUeuLM23feFrxFOI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000021, 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 fbb6efc40e576..4c649d75a4923 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4256,19 +4256,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) {