From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A2E0C7EE31 for ; Thu, 25 May 2023 21:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232437AbjEYVE6 (ORCPT ); Thu, 25 May 2023 17:04:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240717AbjEYVEt (ORCPT ); Thu, 25 May 2023 17:04:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B42F198 for ; Thu, 25 May 2023 14:04:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A5F3C64B2A for ; Thu, 25 May 2023 21:04:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B85EC433D2; Thu, 25 May 2023 21:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1685048672; bh=1aITO+2vwcwYcU+1VYwYgnhsZq0xnR3PA84Ns5azYfE=; h=Date:To:From:Subject:From; b=h0vYAD/ENdhRDLT6daW57TvGqxCpmoFBnducHyFpTNFZst9rFkgw+uPayvIRO0LjL br1MB9Omb0J7mVhzLS3ggbUseK6GwngeIQct2bbfjN81+MaOmDJ27TVnzkxS8w98yF BEJYKdXd2wre8gxHt7UFY/F/FqUS7rhrxgtANax4= Date: Thu, 25 May 2023 14:04:31 -0700 To: mm-commits@vger.kernel.org, Liam.Howlett@oracle.com, zhangpeng.00@bytedance.com, akpm@linux-foundation.org From: Andrew Morton Subject: + maple_tree-make-the-code-symmetrical-in-mas_wr_extend_null.patch added to mm-unstable branch Message-Id: <20230525210432.0B85EC433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: maple_tree: make the code symmetrical in mas_wr_extend_null() has been added to the -mm mm-unstable branch. Its filename is maple_tree-make-the-code-symmetrical-in-mas_wr_extend_null.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple_tree-make-the-code-symmetrical-in-mas_wr_extend_null.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Peng Zhang Subject: maple_tree: make the code symmetrical in mas_wr_extend_null() Date: Wed, 24 May 2023 11:12:42 +0800 Just make the code symmetrical to improve readability. Link: https://lkml.kernel.org/r/20230524031247.65949-6-zhangpeng.00@bytedance.com Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett Signed-off-by: Andrew Morton --- lib/maple_tree.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) --- a/lib/maple_tree.c~maple_tree-make-the-code-symmetrical-in-mas_wr_extend_null +++ a/lib/maple_tree.c @@ -4264,19 +4264,21 @@ static inline void mas_wr_extend_null(st { 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) { _ Patches currently in -mm which might be from zhangpeng.00@bytedance.com are radix-tree-move-declarations-to-header-fix.patch maple_tree-fix-potential-out-of-bounds-access-in-mas_wr_end_piv.patch maple_tree-rework-mtree_alloc_rangerrange.patch maple_tree-drop-mas_rev_alloc-and-mas_fill_gap.patch maple_tree-fix-the-arguments-to-__must_hold.patch maple_tree-simplify-mas_is_span_wr.patch maple_tree-make-the-code-symmetrical-in-mas_wr_extend_null.patch maple_tree-add-mas_wr_new_end-to-calculate-new_end-accurately.patch maple_tree-add-comments-and-some-minor-cleanups-to-mas_wr_append.patch maple_tree-rework-mas_wr_slot_store-to-be-cleaner-and-more-efficient.patch maple_tree-simplify-and-clean-up-mas_wr_node_store.patch maple_tree-relocate-the-declaration-of-mas_empty_area_rev.patch