mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-08-31 13:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: allocate contiguous dirent for creation

Browse Source 
The values used in dirent item creation are one of the  few places we
have value kvecs with multiple entries.  Let's instead allocate and copy
the dirent struct and name into a contiguous buffer so that we can move
towards single vector values.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2018-04-04 09:15:27 -05:00
committed by Mark Swan
parent 08f544cc15
commit 982a0a313e
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/dir.c
+17 -11
View File
@@ -526,26 +526,30 @@ static int add_entry_items(struct super_block *sb, u64 dir_ino, u64 pos,
{
struct scoutfs_key_buf *ent_key = NULL;
struct scoutfs_key_buf *lb_key = NULL;
struct scoutfs_dirent *dent = NULL;
struct scoutfs_key_buf rdir_key;
struct scoutfs_readdir_key rkey;
struct scoutfs_dirent dent;
SCOUTFS_DECLARE_KVEC(val);
bool del_ent = false;
bool del_rdir = false;
int ret;
ent_key = alloc_dirent_key(sb, dir_ino, name, name_len);
dent = kmalloc(offsetof(struct scoutfs_dirent, name[name_len]),
GFP_NOFS);
if (!ent_key || !dent) {
ret = -ENOMEM;
goto out;
}
/* initialize the dent */
dent.ino = cpu_to_le64(ino);
dent.readdir_pos = cpu_to_le64(pos);
dent.type = mode_to_type(mode);
dent->ino = cpu_to_le64(ino);
dent->readdir_pos = cpu_to_le64(pos);
dent->type = mode_to_type(mode);
memcpy(dent->name, name, name_len);
/* dirent item for lookup */
ent_key = alloc_dirent_key(sb, dir_ino, name, name_len);
if (!ent_key)
return -ENOMEM;
scoutfs_kvec_init(val, &dent, sizeof(dent));
scoutfs_kvec_init(val, dent, sizeof(struct scoutfs_dirent));
ret = scoutfs_item_create(sb, ent_key, val, dir_lock);
if (ret)
goto out;
@@ -553,7 +557,8 @@ static int add_entry_items(struct super_block *sb, u64 dir_ino, u64 pos,
/* readdir item for .. readdir */
init_readdir_key(&rdir_key, &rkey, dir_ino, pos);
scoutfs_kvec_init(val, &dent, sizeof(dent), (char *)name, name_len);
scoutfs_kvec_init(val, dent, offsetof(struct scoutfs_dirent,
name[name_len]));
ret = scoutfs_item_create(sb, &rdir_key, val, dir_lock);
if (ret)
@@ -578,6 +583,7 @@ out:
scoutfs_key_free(sb, ent_key);
scoutfs_key_free(sb, lb_key);
kfree(dent);
return ret;
}