mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
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
This commit is contained in:
commit
7926e0bfbb
4 changed files with 4 additions and 10 deletions
|
@ -75,8 +75,6 @@ struct nilfs_btree_path {
|
|||
|
||||
extern struct kmem_cache *nilfs_btree_path_cache;
|
||||
|
||||
int nilfs_btree_path_cache_init(void);
|
||||
void nilfs_btree_path_cache_destroy(void);
|
||||
int nilfs_btree_init(struct nilfs_bmap *);
|
||||
int nilfs_btree_convert_and_insert(struct nilfs_bmap *, __u64, __u64,
|
||||
const __u64 *, const __u64 *, int);
|
||||
|
|
|
@ -127,8 +127,6 @@ struct nilfs_segment_buffer {
|
|||
|
||||
extern struct kmem_cache *nilfs_segbuf_cachep;
|
||||
|
||||
int __init nilfs_init_segbuf_cache(void);
|
||||
void nilfs_destroy_segbuf_cache(void);
|
||||
struct nilfs_segment_buffer *nilfs_segbuf_new(struct super_block *);
|
||||
void nilfs_segbuf_free(struct nilfs_segment_buffer *);
|
||||
void nilfs_segbuf_map(struct nilfs_segment_buffer *, __u64, unsigned long,
|
||||
|
|
|
@ -221,8 +221,6 @@ enum {
|
|||
extern struct kmem_cache *nilfs_transaction_cachep;
|
||||
|
||||
/* segment.c */
|
||||
extern int nilfs_init_transaction_cache(void);
|
||||
extern void nilfs_destroy_transaction_cache(void);
|
||||
extern void nilfs_relax_pressure_in_lock(struct super_block *);
|
||||
|
||||
extern int nilfs_construct_segment(struct super_block *);
|
||||
|
|
|
@ -1130,13 +1130,13 @@ static void nilfs_segbuf_init_once(void *obj)
|
|||
|
||||
static void nilfs_destroy_cachep(void)
|
||||
{
|
||||
if (nilfs_inode_cachep)
|
||||
if (nilfs_inode_cachep)
|
||||
kmem_cache_destroy(nilfs_inode_cachep);
|
||||
if (nilfs_transaction_cachep)
|
||||
if (nilfs_transaction_cachep)
|
||||
kmem_cache_destroy(nilfs_transaction_cachep);
|
||||
if (nilfs_segbuf_cachep)
|
||||
if (nilfs_segbuf_cachep)
|
||||
kmem_cache_destroy(nilfs_segbuf_cachep);
|
||||
if (nilfs_btree_path_cache)
|
||||
if (nilfs_btree_path_cache)
|
||||
kmem_cache_destroy(nilfs_btree_path_cache);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue