Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1b767a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "assoc_array: don't call compare_object() on a node"

parents 745b6ab4 52518e85

lib/assoc_array.c

+3 −1
Original line number Diff line number Diff line
@@ -523,7 +523,9 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit, 
			free_slot = i;

			continue;

		}

		if (ops->compare_object(assoc_array_ptr_to_leaf(ptr), index_key)) {

		if (assoc_array_ptr_is_leaf(ptr) &&

		    ops->compare_object(assoc_array_ptr_to_leaf(ptr),

					index_key)) {

			pr_devel("replace in slot %d\n", i);

			edit->leaf_p = &node->slots[i];

			edit->dead_leaf = node->slots[i];