Commit 908378a3 authored Oct 15, 2024 by Wei Yang Committed by Andrew Morton Nov 06, 2024

maple_tree: simplify mas_push_node()

When count is not 0, we know head is valid.  So we can put the assignment
in if (count) instead of checking the head pointer again.

Also count represents current total, we can assign the new total by
increasing the count by one.

Link: https://lkml.kernel.org/r/20241015120746.15850-4-richard.weiyang@gmail.com


Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 4223dd93

lib/maple_tree.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -1207,19 +1207,17 @@ static inline void mas_push_node(struct ma_state mas, struct maple_node used)

		reuse->request_count = 0;
		reuse->node_count = 0;
		if (count && (head->node_count < MAPLE_ALLOC_SLOTS)) {
		if (count) {
		if (head->node_count < MAPLE_ALLOC_SLOTS) {
		head->slot[head->node_count++] = reuse;
		head->total++;
		goto done;
		}

		reuse->total = 1;
		if ((head) && !((unsigned long)head & 0x1)) {
		reuse->slot[0] = head;
		reuse->node_count = 1;
		reuse->total += head->total;
		}

		reuse->total = count + 1;
		mas->alloc = reuse;
		done:
		if (requested > 1)