[GIT PULL] nilfs2 fixes

[GIT PULL] nilfs2 fixes

[Ryusuke Konishi]

Hi Linus,

please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git for-linus

This fixes a kernel oops on the rc1 and a data loss issue in mmap
write.

Thanks!

Ryusuke Konishi
--
The following changes since commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d:

  Linux 2.6.39-rc1 (2011-03-29 12:09:47 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git for-linus

Nicolas Kaiser (1):
      nilfs2: fix whitespace coding style issues

Ryusuke Konishi (2):
      nilfs2: fix data loss in mmap page write for hole blocks
      nilfs2: fix oops due to a bad aops initialization

 fs/nilfs2/file.c  |   11 +++++------
 fs/nilfs2/nilfs.h |   14 +++++++-------
 fs/nilfs2/page.c  |    4 +++-
 3 files changed, 15 insertions(+), 14 deletions(-)

[GIT PULL] nilfs2 fixes

[Ryusuke Konishi]

Hi Linus,

please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git for-linus

to grab the following fixes.  A style fix and a cleanup, both of which
are against changes in rc1.

Thanks,

Ryusuke Konishi
--
The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e:
  Linus Torvalds (1):
        Linux 2.6.35-rc1

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git for-linus

Ryusuke Konishi (2):
      nilfs2: fix style issue in nilfs_destroy_cachep
      nilfs2: remove obsolete declarations of cache constructor and destructor

 fs/nilfs2/btree.h   |    2 --
 fs/nilfs2/segbuf.h  |    2 --
 fs/nilfs2/segment.h |    2 --
 fs/nilfs2/super.c   |    8 ++++----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/fs/nilfs2/btree.h b/fs/nilfs2/btree.h
index af638d5..43c8c5b 100644
--- a/fs/nilfs2/btree.h
+++ b/fs/nilfs2/btree.h
@@ -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);
diff --git a/fs/nilfs2/segbuf.h b/fs/nilfs2/segbuf.h
index fdf1c3b..85fbb66 100644
--- a/fs/nilfs2/segbuf.h
+++ b/fs/nilfs2/segbuf.h
@@ -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,
diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h
index dca1423..01e20db 100644
--- a/fs/nilfs2/segment.h
+++ b/fs/nilfs2/segment.h
@@ -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 *);
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 03b34b7..414ef68 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -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);
 }
 

[GIT PULL] nilfs2 fixes

[Ryusuke Konishi]

Hi Linus,

Nilfs tree has the following two corrections.

One of the two is an important fix which solves reported file system
corruption infrequently triggered by garbage collection.

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git for-linus

to receive

the following changes since commit 17d857be649a21ca90008c6dc425d849fa83db5c:
  Linus Torvalds (1):
        Linux 2.6.32-rc1

Ryusuke Konishi (2):
      nilfs2: fix missing zero-fill initialization of btree node cache
      nilfs2: fix missing initialization of i_dir_start_lookup member

 fs/nilfs2/btnode.c |    1 +
 fs/nilfs2/inode.c  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

Thanks,
Ryusuke Konishi