Hi Andrew,

Please append the following changes for the upcoming merge window:

Ryusuke Konishi (7):
      nilfs2: do not emit extra newline on nilfs_warning() and nilfs_error()
      nilfs2: remove space before semicolon
      nilfs2: fix code indent coding style issue
      nilfs2: avoid bare use of 'unsigned'
      nilfs2: remove unnecessary else after return or break
      nilfs2: remove loops of single statement macros
      nilfs2: fix block comments


The first patch "nilfs2: do not emit extra newline on nilfs_warning()
and nilfs_error()" fixes the issue that part of warning/error messages
of nilfs2 insert an empty line in the kernel ring buffer.

The rest cleans several coding style issues caught by checkpatch.pl.

Thanks,
Ryusuke Konishi
--

 fs/nilfs2/alloc.c         |  30 +++++++------
 fs/nilfs2/alloc.h         |   2 +-
 fs/nilfs2/bmap.c          |   4 +-
 fs/nilfs2/bmap.h          |  16 ++++---
 fs/nilfs2/btree.c         |  15 ++++---
 fs/nilfs2/cpfile.c        |  14 +++---
 fs/nilfs2/cpfile.h        |   4 +-
 fs/nilfs2/dat.c           |   2 +-
 fs/nilfs2/dat.h           |   2 +-
 fs/nilfs2/dir.c           |  51 +++++++++++-----------
 fs/nilfs2/direct.c        |  11 ++---
 fs/nilfs2/ifile.c         |   6 ++-
 fs/nilfs2/inode.c         |  93 +++++++++++++++++++++++----------------
 fs/nilfs2/mdt.c           |   4 +-
 fs/nilfs2/mdt.h           |   6 +--
 fs/nilfs2/namei.c         |   4 +-
 fs/nilfs2/nilfs.h         |  26 +++++++----
 fs/nilfs2/page.c          |   8 ++--
 fs/nilfs2/page.h          |   3 +-
 fs/nilfs2/recovery.c      |  18 +++++---
 fs/nilfs2/segbuf.c        |   4 +-
 fs/nilfs2/segbuf.h        |   5 ++-
 fs/nilfs2/segment.c       | 108 ++++++++++++++++++++++++++--------------------
 fs/nilfs2/segment.h       |  38 ++++++++++------
 fs/nilfs2/super.c         |   4 +-
 fs/nilfs2/sysfs.c         |   6 +--
 fs/nilfs2/the_nilfs.c     |  10 +++--
 fs/nilfs2/the_nilfs.h     |  19 ++++----
 include/linux/nilfs2_fs.h |  72 ++++++++++++++++++++-----------
 29 files changed, 342 insertions(+), 243 deletions(-)


Reply via email to