Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: remove obsolete declarations of cache constructor and destructor
nilfs2: fix style issue in nilfs_destroy_cachep
+4
-10
-2
fs/nilfs2/btree.h
-2
fs/nilfs2/btree.h
···
75
75
76
76
extern struct kmem_cache *nilfs_btree_path_cache;
77
77
78
-
int nilfs_btree_path_cache_init(void);
79
-
void nilfs_btree_path_cache_destroy(void);
80
78
int nilfs_btree_init(struct nilfs_bmap *);
81
79
int nilfs_btree_convert_and_insert(struct nilfs_bmap *, __u64, __u64,
82
80
const __u64 *, const __u64 *, int);
-2
fs/nilfs2/segbuf.h
-2
fs/nilfs2/segbuf.h
···
127
127
128
128
extern struct kmem_cache *nilfs_segbuf_cachep;
129
129
130
-
int __init nilfs_init_segbuf_cache(void);
131
-
void nilfs_destroy_segbuf_cache(void);
132
130
struct nilfs_segment_buffer *nilfs_segbuf_new(struct super_block *);
133
131
void nilfs_segbuf_free(struct nilfs_segment_buffer *);
134
132
void nilfs_segbuf_map(struct nilfs_segment_buffer *, __u64, unsigned long,
-2
fs/nilfs2/segment.h
-2
fs/nilfs2/segment.h
···
221
221
extern struct kmem_cache *nilfs_transaction_cachep;
222
222
223
223
/* segment.c */
224
-
extern int nilfs_init_transaction_cache(void);
225
-
extern void nilfs_destroy_transaction_cache(void);
226
224
extern void nilfs_relax_pressure_in_lock(struct super_block *);
227
225
228
226
extern int nilfs_construct_segment(struct super_block *);
+4
-4
fs/nilfs2/super.c
+4
-4
fs/nilfs2/super.c
···
1130
1130
1131
1131
static void nilfs_destroy_cachep(void)
1132
1132
{
1133
-
if (nilfs_inode_cachep)
1133
+
if (nilfs_inode_cachep)
1134
1134
kmem_cache_destroy(nilfs_inode_cachep);
1135
-
if (nilfs_transaction_cachep)
1135
+
if (nilfs_transaction_cachep)
1136
1136
kmem_cache_destroy(nilfs_transaction_cachep);
1137
-
if (nilfs_segbuf_cachep)
1137
+
if (nilfs_segbuf_cachep)
1138
1138
kmem_cache_destroy(nilfs_segbuf_cachep);
1139
-
if (nilfs_btree_path_cache)
1139
+
if (nilfs_btree_path_cache)
1140
1140
kmem_cache_destroy(nilfs_btree_path_cache);
1141
1141
}
1142
1142