[GIT PULL] nilfs2 fixes for 2.6.34

[GIT PULL] nilfs2 fixes for 2.6.34

[Ryusuke Konishi]

Hi Linus,

please pull from:

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

to receive the following patches.  All of these are trivial fixes.

Thanks!

Ryusuke Konishi
--
The following changes since commit 57d54889cd00db2752994b389ba714138652e60c:
  Linus Torvalds (1):
        Linux 2.6.34-rc1

Ryusuke Konishi (6):
      nilfs2: fix discrepancy in use of static specifier
      nilfs2: fix function name typos in docbook comments
      nilfs2: fix typo "cout" -> "count" in error message
      nilfs2: fix various typos in comments
      nilfs2: remove spaces before tabs
      nilfs2: remove whitespaces before quoted newlines

 fs/nilfs2/alloc.h     |    2 +-
 fs/nilfs2/dat.c       |    2 +-
 fs/nilfs2/dir.c       |    2 +-
 fs/nilfs2/gcinode.c   |    4 ++--
 fs/nilfs2/page.c      |    4 ++--
 fs/nilfs2/segbuf.c    |   10 +++++-----
 fs/nilfs2/segment.c   |    8 ++++----
 fs/nilfs2/segment.h   |    4 ++--
 fs/nilfs2/sufile.c    |    2 +-
 fs/nilfs2/super.c     |    4 ++--
 fs/nilfs2/the_nilfs.c |    2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

[GIT PULL] nilfs2 fixes for 2.6.34

[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, only containing trivial ones.

Thanks!

Ryusuke Konishi
--
The following changes since commit 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6:
  Linus Torvalds (1):
        Linux 2.6.34-rc3

Li Hong (2):
      nilfs2: fix a wrong type conversion in nilfs_ioctl()
      nilfs2: Remove an uninitialization warning in nilfs_btree_propagate_v()

Ryusuke Konishi (1):
      nilfs2: fix typo "numer" -> "number" in alloc.c

 fs/nilfs2/alloc.c |    2 +-
 fs/nilfs2/btree.c |    2 +-
 fs/nilfs2/ioctl.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 3f959f1..c2a1387 100644
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -425,7 +425,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,
 	bitmap = bitmap_kaddr + bh_offset(req->pr_bitmap_bh);
 	if (!nilfs_clear_bit_atomic(nilfs_mdt_bgl_lock(inode, group),
 				    group_offset, bitmap))
-		printk(KERN_WARNING "%s: entry numer %llu already freed\n",
+		printk(KERN_WARNING "%s: entry number %llu already freed\n",
 		       __func__, (unsigned long long)req->pr_entry_nr);
 
 	nilfs_palloc_group_desc_add_entries(inode, group, desc, 1);
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 7cdd98b..76c38e3 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -1879,7 +1879,7 @@ static int nilfs_btree_propagate_v(struct nilfs_btree *btree,
 				   struct nilfs_btree_path *path,
 				   int level, struct buffer_head *bh)
 {
-	int maxlevel, ret;
+	int maxlevel = 0, ret;
 	struct nilfs_btree_node *parent;
 	struct inode *dat = nilfs_bmap_get_dat(&btree->bt_bmap);
 	__u64 ptr;
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 313d0a2..c446017 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -648,7 +648,7 @@ static int nilfs_ioctl_get_info(struct inode *inode, struct file *filp,
 long nilfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
 	struct inode *inode = filp->f_dentry->d_inode;
-	void __user *argp = (void * __user *)arg;
+	void __user *argp = (void __user *)arg;
 
 	switch (cmd) {
 	case NILFS_IOCTL_CHANGE_CPMODE:

[GIT PULL] nilfs2 fixes for 2.6.34

[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 for reported hangup issue and a few log
writer bugs.

Thanks!

Ryusuke Konishi
--
The following changes since commit 220bf991b0366cc50a94feede3d7341fa5710ee4:
  Linus Torvalds (1):
        Linux 2.6.34-rc2

Ryusuke Konishi (3):
      nilfs2: fix duplicate call to nilfs_segctor_cancel_freev
      nilfs2: fix hang-up of cleaner after log writer returned with error
      nilfs2: fix imperfect completion wait in nilfs_wait_on_logs

 fs/nilfs2/segbuf.c  |    8 ++++----
 fs/nilfs2/segment.c |   15 +++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)