mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
assoc_array: use assoc_array_parent_link() when splitting a shortcut
assoc_array_insert_mid_shortcut() works out by hand which pointer leads to the shortcut it splits: the same cases as assoc_array_parent_link(), with a BUG() for a shortcut behind anything but a node. Use the function, and keep the check as a BUG_ON(). No functional change. Assisted-by: LLM Signed-off-by: Linus Torvalds <[email protected]> Tested-by: David Howells <[email protected]> Reviewed-by: David Howells <[email protected]>
This commit is contained in:
+6
-9
@@ -870,7 +870,7 @@ static bool assoc_array_insert_mid_shortcut(struct assoc_array_edit *edit,
|
||||
struct assoc_array_walk_result *result)
|
||||
{
|
||||
struct assoc_array_shortcut *shortcut, *new_s0, *new_s1;
|
||||
struct assoc_array_node *node, *new_n0, *side;
|
||||
struct assoc_array_node *new_n0, *side;
|
||||
unsigned long sc_segments, dissimilarity, blank;
|
||||
size_t keylen;
|
||||
int level, sc_level, diff;
|
||||
@@ -896,14 +896,11 @@ static bool assoc_array_insert_mid_shortcut(struct assoc_array_edit *edit,
|
||||
diff += sc_level & ~ASSOC_ARRAY_KEY_CHUNK_MASK;
|
||||
pr_devel("diff=%d\n", diff);
|
||||
|
||||
if (!shortcut->back_pointer) {
|
||||
edit->set[0].ptr = &edit->array->root;
|
||||
} else if (assoc_array_ptr_is_node(shortcut->back_pointer)) {
|
||||
node = assoc_array_ptr_to_node(shortcut->back_pointer);
|
||||
edit->set[0].ptr = &node->slots[shortcut->parent_slot];
|
||||
} else {
|
||||
BUG();
|
||||
}
|
||||
BUG_ON(shortcut->back_pointer &&
|
||||
!assoc_array_ptr_is_node(shortcut->back_pointer));
|
||||
edit->set[0].ptr = assoc_array_parent_link(edit->array,
|
||||
shortcut->back_pointer,
|
||||
shortcut->parent_slot);
|
||||
|
||||
edit->excised_meta[0] = assoc_array_shortcut_to_ptr(shortcut);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user