mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-10 13:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix existing item insertion

Browse Source 
Inserting an item over an existing key was super broken.  Now that we're
not replacing we can't stop descent if we find an existing item.  We
need to keep descending and then insert.  And the caller needs to, you
know, actually remove the existing item when it's found -- not the item
it just inserted :P.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2016-12-08 09:10:55 -08:00
parent 5eb388ae6e
commit fbd12b4dda
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kmod/src/item.c
View File

@@ -122,17 +122,19 @@ static struct cached_item *insert_item(struct rb_root *root,
item = container_of(*node, struct cached_item, node);
cmp = scoutfs_kvec_memcmp(ins->key, item->key);
if (cmp == 0) {
BUG_ON(existing);
existing = item;
}
if (cmp < 0) {
if (ins->dirty)
item->dirty |= LEFT_DIRTY;
node = &(*node)->rb_left;
} else if (cmp > 0) {
} else {
if (ins->dirty)
item->dirty |= RIGHT_DIRTY;
node = &(*node)->rb_right;
} else {
existing = item;
break;
}
}
@@ -376,7 +378,7 @@ static int add_item(struct super_block *sb, struct kvec *key, struct kvec *val,
existing = insert_item(&cac->root, item);
if (existing) {
clear_item_dirty(cac, existing);
rb_erase_augmented(&item->node, &cac->root,
rb_erase_augmented(&existing->node, &cac->root,
&scoutfs_item_rb_cb);
}
mark_item_dirty(cac, item);