]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 14:31:13 +0000 (07:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 14:31:13 +0000 (07:31 -0700)
* '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

fs/nilfs2/btree.h
fs/nilfs2/segbuf.h
fs/nilfs2/segment.h
fs/nilfs2/super.c

index af638d59e3bf5ef07064e57173dcc2f82328724f..43c8c5b541fd84c09d0af119b8f555a247d04522 100644 (file)
@@ -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);
index fdf1c3b6d6739c6cc76bd451ee8230b573800acf..85fbb66455e2ed43d4004724e24c4930bf4af48f 100644 (file)
@@ -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,
index dca142361ccfcac8f038453ec689ee61a97012fa..01e20dbb217d9a746a1324b474251e0a8c0100cf 100644 (file)
@@ -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 *);
index 03b34b738993fb39c006c1b3248e4f36488e4558..414ef68931cf48dc0443892cae12bcab91262660 100644 (file)
@@ -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);
 }