Commit 61e9df70 authored by Wei Yang's avatar Wei Yang Committed by Andrew Morton
Browse files

maple_tree: calculate new_end when needed 

Patch series "Following cleanup after introduce mas_wr_store_type()", v2.

Patch 1 postpone new_end calculation when needed.
Patch 2 removes a unnecessary sanity check in mas_wr_slot_store().


This patch (of 2):

For wr_exact_fit/wr_new_root, we don't need to calculate new_end.

Let's postpone it until necessary.

Link: https://lkml.kernel.org/r/20241017015809.23392-1-richard.weiyang@gmail.com
Link: https://lkml.kernel.org/r/20241017015809.23392-2-richard.weiyang@gmail.com


Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Reviewed-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0938b161

lib/maple_tree.c

+1 −1
Original line number Diff line number Diff line
@@ -4211,13 +4211,13 @@ static inline enum store_type mas_wr_store_type(struct ma_wr_state *wr_mas) 
	if (!wr_mas->entry)

		mas_wr_extend_null(wr_mas);



	new_end = mas_wr_new_end(wr_mas);

	if ((wr_mas->r_min == mas->index) && (wr_mas->r_max == mas->last))

		return wr_exact_fit;



	if (unlikely(!mas->index && mas->last == ULONG_MAX))

		return wr_new_root;



	new_end = mas_wr_new_end(wr_mas);

	/* Potential spanning rebalance collapsing a node */

	if (new_end < mt_min_slots[wr_mas->type]) {

		if (!mte_is_root(mas->node) && !(mas->mas_flags & MA_STATE_BULK))