__vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
vlist_update_cb update, int offset)
{
- tree->node_offset = offset;
+ tree->key_offset = offset;
tree->update = update;
tree->version = 1;
void
vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
{
- avl_delete(&tree->avl, &node->avl);
+ if (!tree->no_delete)
+ avl_delete(&tree->avl, &node->avl);
tree->update(tree, NULL, node);
}
{
struct vlist_node *old_node = NULL;
struct avl_node *anode;
- void *key = (char *) node - tree->node_offset;
+ void *key = (char *) node + tree->key_offset;
node->avl.key = key;
node->version = tree->version;
anode = avl_find(&tree->avl, key);
if (anode) {
- if (tree->keep_old)
+ old_node = container_of(anode, struct vlist_node, avl);
+ if (tree->keep_old || !tree->no_delete)
goto update_only;
- old_node = container_of(anode, struct vlist_node, avl);
avl_delete(&tree->avl, anode);
}