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

Fix up manifest key use

Browse Source 
The manifest entries were changed to be a single contiguous allocation.

The calculation of the vec that points to the last key vec was adding
the key length in units of the add manifest struct.

Adding the manifest wasn't setting the key lengths nor copying the keys
into their position in the entry alloc.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2016-12-07 10:33:05 -08:00
parent c4954eb6f4
commit be98c4dfd8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kmod/src/manifest.c
View File

@@ -67,7 +67,7 @@ static void init_ment_keys(struct manifest_entry *ment, struct kvec *first,
{
scoutfs_kvec_init(first, &ment->am + 1,
le16_to_cpu(ment->am.first_key_len));
scoutfs_kvec_init(last, &ment->am + 1 +
scoutfs_kvec_init(last, (void *)(&ment->am + 1) +
le16_to_cpu(ment->am.first_key_len),
le16_to_cpu(ment->am.last_key_len));
}
@@ -209,6 +209,8 @@ int scoutfs_manifest_add(struct super_block *sb, struct kvec *first,
{
DECLARE_MANIFEST(sb, mani);
struct manifest_entry *ment;
SCOUTFS_DECLARE_KVEC(ment_first);
SCOUTFS_DECLARE_KVEC(ment_last);
unsigned long flags;
int bytes;
int ret;
@@ -229,8 +231,14 @@ int scoutfs_manifest_add(struct super_block *sb, struct kvec *first,
ment->am.eh.len = cpu_to_le16(bytes);
ment->am.segno = cpu_to_le64(segno);
ment->am.seq = cpu_to_le64(seq);
ment->am.first_key_len = cpu_to_le16(scoutfs_kvec_length(first));
ment->am.last_key_len = cpu_to_le16(scoutfs_kvec_length(last));
ment->am.level = level;
init_ment_keys(ment, ment_first, ment_last);
scoutfs_kvec_memcpy(ment_first, first);
scoutfs_kvec_memcpy(ment_last, last);
/* XXX think about where to insert level 0 */
spin_lock_irqsave(&mani->lock, flags);
ret = add_ment(mani, ment, dirty);