diff options
author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2014-03-07 05:43:28 -0500 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2014-03-10 05:45:14 -0400 |
commit | e8512d2e0c4eb38cd78b1499bb08d7d8eea6c723 (patch) | |
tree | 9c5f2990b8f14b14ba82cb2469f9afd9f12e976b | |
parent | b6ce391e615175029cb8496f03afc9905e0957cc (diff) |
f2fs: remove the unused ctor argument of f2fs_kmem_cache_create()
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
-rw-r--r-- | fs/f2fs/checkpoint.c | 4 | ||||
-rw-r--r-- | fs/f2fs/f2fs.h | 4 | ||||
-rw-r--r-- | fs/f2fs/gc.c | 2 | ||||
-rw-r--r-- | fs/f2fs/node.c | 4 | ||||
-rw-r--r-- | fs/f2fs/recovery.c | 2 | ||||
-rw-r--r-- | fs/f2fs/segment.c | 2 | ||||
-rw-r--r-- | fs/f2fs/super.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index f069249011b2..911b6f9e9f7b 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c | |||
@@ -939,11 +939,11 @@ void init_orphan_info(struct f2fs_sb_info *sbi) | |||
939 | int __init create_checkpoint_caches(void) | 939 | int __init create_checkpoint_caches(void) |
940 | { | 940 | { |
941 | orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry", | 941 | orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry", |
942 | sizeof(struct orphan_inode_entry), NULL); | 942 | sizeof(struct orphan_inode_entry)); |
943 | if (!orphan_entry_slab) | 943 | if (!orphan_entry_slab) |
944 | return -ENOMEM; | 944 | return -ENOMEM; |
945 | inode_entry_slab = f2fs_kmem_cache_create("f2fs_dirty_dir_entry", | 945 | inode_entry_slab = f2fs_kmem_cache_create("f2fs_dirty_dir_entry", |
946 | sizeof(struct dir_inode_entry), NULL); | 946 | sizeof(struct dir_inode_entry)); |
947 | if (!inode_entry_slab) { | 947 | if (!inode_entry_slab) { |
948 | kmem_cache_destroy(orphan_entry_slab); | 948 | kmem_cache_destroy(orphan_entry_slab); |
949 | return -ENOMEM; | 949 | return -ENOMEM; |
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 8b2cb82f852b..f845e9282f5e 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h | |||
@@ -852,9 +852,9 @@ static inline void f2fs_put_dnode(struct dnode_of_data *dn) | |||
852 | } | 852 | } |
853 | 853 | ||
854 | static inline struct kmem_cache *f2fs_kmem_cache_create(const char *name, | 854 | static inline struct kmem_cache *f2fs_kmem_cache_create(const char *name, |
855 | size_t size, void (*ctor)(void *)) | 855 | size_t size) |
856 | { | 856 | { |
857 | return kmem_cache_create(name, size, 0, SLAB_RECLAIM_ACCOUNT, ctor); | 857 | return kmem_cache_create(name, size, 0, SLAB_RECLAIM_ACCOUNT, NULL); |
858 | } | 858 | } |
859 | 859 | ||
860 | static inline void *f2fs_kmem_cache_alloc(struct kmem_cache *cachep, | 860 | static inline void *f2fs_kmem_cache_alloc(struct kmem_cache *cachep, |
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index d94acbc3d928..b90dbe55403a 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c | |||
@@ -742,7 +742,7 @@ void build_gc_manager(struct f2fs_sb_info *sbi) | |||
742 | int __init create_gc_caches(void) | 742 | int __init create_gc_caches(void) |
743 | { | 743 | { |
744 | winode_slab = f2fs_kmem_cache_create("f2fs_gc_inodes", | 744 | winode_slab = f2fs_kmem_cache_create("f2fs_gc_inodes", |
745 | sizeof(struct inode_entry), NULL); | 745 | sizeof(struct inode_entry)); |
746 | if (!winode_slab) | 746 | if (!winode_slab) |
747 | return -ENOMEM; | 747 | return -ENOMEM; |
748 | return 0; | 748 | return 0; |
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 77b61893fc8d..12c9ded767d9 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c | |||
@@ -1890,12 +1890,12 @@ void destroy_node_manager(struct f2fs_sb_info *sbi) | |||
1890 | int __init create_node_manager_caches(void) | 1890 | int __init create_node_manager_caches(void) |
1891 | { | 1891 | { |
1892 | nat_entry_slab = f2fs_kmem_cache_create("nat_entry", | 1892 | nat_entry_slab = f2fs_kmem_cache_create("nat_entry", |
1893 | sizeof(struct nat_entry), NULL); | 1893 | sizeof(struct nat_entry)); |
1894 | if (!nat_entry_slab) | 1894 | if (!nat_entry_slab) |
1895 | return -ENOMEM; | 1895 | return -ENOMEM; |
1896 | 1896 | ||
1897 | free_nid_slab = f2fs_kmem_cache_create("free_nid", | 1897 | free_nid_slab = f2fs_kmem_cache_create("free_nid", |
1898 | sizeof(struct free_nid), NULL); | 1898 | sizeof(struct free_nid)); |
1899 | if (!free_nid_slab) { | 1899 | if (!free_nid_slab) { |
1900 | kmem_cache_destroy(nat_entry_slab); | 1900 | kmem_cache_destroy(nat_entry_slab); |
1901 | return -ENOMEM; | 1901 | return -ENOMEM; |
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index aef77681e10b..03b28ec4c2dc 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c | |||
@@ -436,7 +436,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi) | |||
436 | bool need_writecp = false; | 436 | bool need_writecp = false; |
437 | 437 | ||
438 | fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry", | 438 | fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry", |
439 | sizeof(struct fsync_inode_entry), NULL); | 439 | sizeof(struct fsync_inode_entry)); |
440 | if (!fsync_entry_slab) | 440 | if (!fsync_entry_slab) |
441 | return -ENOMEM; | 441 | return -ENOMEM; |
442 | 442 | ||
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index fbb41ba818fd..199c964680c5 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c | |||
@@ -1878,7 +1878,7 @@ void destroy_segment_manager(struct f2fs_sb_info *sbi) | |||
1878 | int __init create_segment_manager_caches(void) | 1878 | int __init create_segment_manager_caches(void) |
1879 | { | 1879 | { |
1880 | discard_entry_slab = f2fs_kmem_cache_create("discard_entry", | 1880 | discard_entry_slab = f2fs_kmem_cache_create("discard_entry", |
1881 | sizeof(struct discard_entry), NULL); | 1881 | sizeof(struct discard_entry)); |
1882 | if (!discard_entry_slab) | 1882 | if (!discard_entry_slab) |
1883 | return -ENOMEM; | 1883 | return -ENOMEM; |
1884 | return 0; | 1884 | return 0; |
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1bd915362154..72df734764e7 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c | |||
@@ -1089,7 +1089,7 @@ MODULE_ALIAS_FS("f2fs"); | |||
1089 | static int __init init_inodecache(void) | 1089 | static int __init init_inodecache(void) |
1090 | { | 1090 | { |
1091 | f2fs_inode_cachep = f2fs_kmem_cache_create("f2fs_inode_cache", | 1091 | f2fs_inode_cachep = f2fs_kmem_cache_create("f2fs_inode_cache", |
1092 | sizeof(struct f2fs_inode_info), NULL); | 1092 | sizeof(struct f2fs_inode_info)); |
1093 | if (!f2fs_inode_cachep) | 1093 | if (!f2fs_inode_cachep) |
1094 | return -ENOMEM; | 1094 | return -ENOMEM; |
1095 | return 0; | 1095 | return 0; |