github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rbtree: Fix swapping out-of-tree node with root

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
Robert Baldyga 2020-11-30 15:50:20 +01:00
parent 0a57a3a58f
commit b8735f6517
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/utils_rbtree.c
View File

@ -192,6 +192,10 @@ static void ocf_rb_tree_update_children(struct ocf_rb_node *node)
node->right->parent = node; node->right->parent = node;
} }
/*
* Note: When swapping with out-of-tree element, the tree member must go
* as node1 and out-of-tree item as node2.
*/
static void ocf_rb_tree_swap(struct ocf_rb_tree *tree, static void ocf_rb_tree_swap(struct ocf_rb_tree *tree,
struct ocf_rb_node *node1, struct ocf_rb_node *node2) struct ocf_rb_node *node1, struct ocf_rb_node *node2)
{ {
@ -218,8 +222,8 @@ static void ocf_rb_tree_swap(struct ocf_rb_tree *tree,
ocf_rb_tree_update_children(node1); ocf_rb_tree_update_children(node1);
ocf_rb_tree_update_children(node2); ocf_rb_tree_update_children(node2);
ocf_rb_tree_update_parent(tree, node2->parent, node1, node2);
ocf_rb_tree_update_parent(tree, node1->parent, node2, node1); ocf_rb_tree_update_parent(tree, node1->parent, node2, node1);
ocf_rb_tree_update_parent(tree, node2->parent, node1, node2);
} }
static struct ocf_rb_node *ocf_rb_tree_successor(struct ocf_rb_node *node) static struct ocf_rb_node *ocf_rb_tree_successor(struct ocf_rb_node *node)