Commit 4223dd93 authored by Wei Yang's avatar Wei Yang Committed by Andrew Morton
Browse files

maple_tree: total is not changed for nomem_one case 

If it jumps to nomem_one, the total allocated number is not changed.  So
we don't need to adjust it.

For the nomem_bulk case, we know there is a valid mas->alloc.  So we don't
need to do the check.

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


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

lib/maple_tree.c

+1 −2
Original line number Diff line number Diff line
@@ -1297,10 +1297,9 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp) 
nomem_bulk:

	/* Clean up potential freed allocations on bulk failure */

	memset(slots, 0, max_req * sizeof(unsigned long));

	mas->alloc->total = allocated;

nomem_one:

	mas_set_alloc_req(mas, requested);

	if (mas->alloc && !(((unsigned long)mas->alloc & 0x1)))

		mas->alloc->total = allocated;

	mas_set_err(mas, -ENOMEM);

}