mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-04-22 14:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix seg item filling

Browse Source 
The two functions that added to items had little bugs.  They initialized
the item vectors incorrectly and didn't actually store the keys and
values.  Appending was always overwriting the first segment.  Have it
call 'nr' 'pos' like the rest of the code to make it more clear.

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

14
kmod/src/seg.c
View File

@@ -490,7 +490,7 @@ void scoutfs_seg_first_item(struct super_block *sb, struct scoutfs_segment *seg,
item.val_len = scoutfs_kvec_length(val);
store_item(seg, 0, &item);
scoutfs_seg_item_kvecs(seg, 0, key, val);
scoutfs_seg_item_kvecs(seg, 0, item_key, item_val);
scoutfs_kvec_memcpy(item_key, key);
scoutfs_kvec_memcpy(item_val, val);
}
@@ -504,21 +504,21 @@ void scoutfs_seg_append_item(struct super_block *sb,
struct native_item prev;
SCOUTFS_DECLARE_KVEC(item_key);
SCOUTFS_DECLARE_KVEC(item_val);
u32 nr;
u32 pos;
nr = le32_to_cpu(sblk->nr_items);
sblk->nr_items = cpu_to_le32(nr + 1);
pos = le32_to_cpu(sblk->nr_items);
sblk->nr_items = cpu_to_le32(pos + 1);
load_item(seg, nr - 1, &prev);
load_item(seg, pos - 1, &prev);
item.seq = 1;
item.key_off = prev.key_off + prev.key_len;
item.key_len = scoutfs_kvec_length(key);
item.val_off = prev.val_off + prev.val_len;
item.val_len = scoutfs_kvec_length(val);
store_item(seg, 0, &item);
store_item(seg, pos, &item);
scoutfs_seg_item_kvecs(seg, nr, key, val);
scoutfs_seg_item_kvecs(seg, pos, item_key, item_val);
scoutfs_kvec_memcpy(item_key, key);
scoutfs_kvec_memcpy(item_val, val);
}