Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8512d2e authored by Gu Zheng's avatar Gu Zheng Committed by Jaegeuk Kim
Browse files

f2fs: remove the unused ctor argument of f2fs_kmem_cache_create() 



Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent b6ce391e

fs/f2fs/checkpoint.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -939,11 +939,11 @@ void init_orphan_info(struct f2fs_sb_info *sbi) 
int __init create_checkpoint_caches(void)

int __init create_checkpoint_caches(void)

{

{

	orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry",

	orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry",

			sizeof(struct orphan_inode_entry), NULL);

			sizeof(struct orphan_inode_entry));

	if (!orphan_entry_slab)

	if (!orphan_entry_slab)

		return -ENOMEM;

		return -ENOMEM;

	inode_entry_slab = f2fs_kmem_cache_create("f2fs_dirty_dir_entry",

	inode_entry_slab = f2fs_kmem_cache_create("f2fs_dirty_dir_entry",

			sizeof(struct dir_inode_entry), NULL);

			sizeof(struct dir_inode_entry));

	if (!inode_entry_slab) {

	if (!inode_entry_slab) {

		kmem_cache_destroy(orphan_entry_slab);

		kmem_cache_destroy(orphan_entry_slab);

		return -ENOMEM;

		return -ENOMEM;

fs/f2fs/f2fs.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -852,9 +852,9 @@ static inline void f2fs_put_dnode(struct dnode_of_data *dn) 
}

}





static inline struct kmem_cache *f2fs_kmem_cache_create(const char *name,

static inline struct kmem_cache *f2fs_kmem_cache_create(const char *name,

					size_t size, void (*ctor)(void *))

					size_t size)

{

{

	return kmem_cache_create(name, size, 0, SLAB_RECLAIM_ACCOUNT, ctor);

	return kmem_cache_create(name, size, 0, SLAB_RECLAIM_ACCOUNT, NULL);

}

}





static inline void *f2fs_kmem_cache_alloc(struct kmem_cache *cachep,

static inline void *f2fs_kmem_cache_alloc(struct kmem_cache *cachep,

fs/f2fs/gc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -742,7 +742,7 @@ void build_gc_manager(struct f2fs_sb_info *sbi) 
int __init create_gc_caches(void)

int __init create_gc_caches(void)

{

{

	winode_slab = f2fs_kmem_cache_create("f2fs_gc_inodes",

	winode_slab = f2fs_kmem_cache_create("f2fs_gc_inodes",

			sizeof(struct inode_entry), NULL);

			sizeof(struct inode_entry));

	if (!winode_slab)

	if (!winode_slab)

		return -ENOMEM;

		return -ENOMEM;

	return 0;

	return 0;

fs/f2fs/node.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1890,12 +1890,12 @@ void destroy_node_manager(struct f2fs_sb_info *sbi) 
int __init create_node_manager_caches(void)

int __init create_node_manager_caches(void)

{

{

	nat_entry_slab = f2fs_kmem_cache_create("nat_entry",

	nat_entry_slab = f2fs_kmem_cache_create("nat_entry",

			sizeof(struct nat_entry), NULL);

			sizeof(struct nat_entry));

	if (!nat_entry_slab)

	if (!nat_entry_slab)

		return -ENOMEM;

		return -ENOMEM;





	free_nid_slab = f2fs_kmem_cache_create("free_nid",

	free_nid_slab = f2fs_kmem_cache_create("free_nid",

			sizeof(struct free_nid), NULL);

			sizeof(struct free_nid));

	if (!free_nid_slab) {

	if (!free_nid_slab) {

		kmem_cache_destroy(nat_entry_slab);

		kmem_cache_destroy(nat_entry_slab);

		return -ENOMEM;

		return -ENOMEM;

fs/f2fs/recovery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -436,7 +436,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi) 
	bool need_writecp = false;

	bool need_writecp = false;





	fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",

	fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",

			sizeof(struct fsync_inode_entry), NULL);

			sizeof(struct fsync_inode_entry));

	if (!fsync_entry_slab)

	if (!fsync_entry_slab)

		return -ENOMEM;

		return -ENOMEM;