mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
jffs2: Simplify the allocation of slab caches
Use the new KMEM_CACHE() macro instead of direct kmem_cache_create to simplify the creation of SLAB caches. And change cache name from 'jffs2_tmp_dnode' to 'jffs2_tmp_dnode_info'. Signed-off-by: Kunwu Chan <chentao@kylinos.cn> Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
2e0a808224
commit
7096fae56f
@ -33,27 +33,19 @@ static struct kmem_cache *xattr_ref_cache;
|
|||||||
|
|
||||||
int __init jffs2_create_slab_caches(void)
|
int __init jffs2_create_slab_caches(void)
|
||||||
{
|
{
|
||||||
full_dnode_slab = kmem_cache_create("jffs2_full_dnode",
|
full_dnode_slab = KMEM_CACHE(jffs2_full_dnode, 0);
|
||||||
sizeof(struct jffs2_full_dnode),
|
|
||||||
0, 0, NULL);
|
|
||||||
if (!full_dnode_slab)
|
if (!full_dnode_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
|
raw_dirent_slab = KMEM_CACHE(jffs2_raw_dirent, SLAB_HWCACHE_ALIGN);
|
||||||
sizeof(struct jffs2_raw_dirent),
|
|
||||||
0, SLAB_HWCACHE_ALIGN, NULL);
|
|
||||||
if (!raw_dirent_slab)
|
if (!raw_dirent_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
|
raw_inode_slab = KMEM_CACHE(jffs2_raw_inode, SLAB_HWCACHE_ALIGN);
|
||||||
sizeof(struct jffs2_raw_inode),
|
|
||||||
0, SLAB_HWCACHE_ALIGN, NULL);
|
|
||||||
if (!raw_inode_slab)
|
if (!raw_inode_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
|
tmp_dnode_info_slab = KMEM_CACHE(jffs2_tmp_dnode_info, 0);
|
||||||
sizeof(struct jffs2_tmp_dnode_info),
|
|
||||||
0, 0, NULL);
|
|
||||||
if (!tmp_dnode_info_slab)
|
if (!tmp_dnode_info_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
@ -63,28 +55,20 @@ int __init jffs2_create_slab_caches(void)
|
|||||||
if (!raw_node_ref_slab)
|
if (!raw_node_ref_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
node_frag_slab = kmem_cache_create("jffs2_node_frag",
|
node_frag_slab = KMEM_CACHE(jffs2_node_frag, 0);
|
||||||
sizeof(struct jffs2_node_frag),
|
|
||||||
0, 0, NULL);
|
|
||||||
if (!node_frag_slab)
|
if (!node_frag_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
|
inode_cache_slab = KMEM_CACHE(jffs2_inode_cache, 0);
|
||||||
sizeof(struct jffs2_inode_cache),
|
|
||||||
0, 0, NULL);
|
|
||||||
if (!inode_cache_slab)
|
if (!inode_cache_slab)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
#ifdef CONFIG_JFFS2_FS_XATTR
|
#ifdef CONFIG_JFFS2_FS_XATTR
|
||||||
xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",
|
xattr_datum_cache = KMEM_CACHE(jffs2_xattr_datum, 0);
|
||||||
sizeof(struct jffs2_xattr_datum),
|
|
||||||
0, 0, NULL);
|
|
||||||
if (!xattr_datum_cache)
|
if (!xattr_datum_cache)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",
|
xattr_ref_cache = KMEM_CACHE(jffs2_xattr_ref, 0);
|
||||||
sizeof(struct jffs2_xattr_ref),
|
|
||||||
0, 0, NULL);
|
|
||||||
if (!xattr_ref_cache)
|
if (!xattr_ref_cache)
|
||||||
goto err;
|
goto err;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user