Merge tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy

Pull jfs updates from Dave Kleikamp:
 "Some jfs logging cleanups from Joe Perches"

* tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy:
  jfs: Coalesce some formats
  jfs: Remove unnecessary line continuations and terminating newlines
  jfs: Remove terminating newlines from jfs_info, jfs_warn, jfs_err uses

diff --combined fs/jfs/namei.c
index 8a40941ac9a67009524cb1f4f9676d837de024d2,211796a4baf2e1f5abbf6851cf0f60454e81f7df..ff671edcf4f04b39f7b13315d97a1b304cd456ca
--- 1/fs/jfs/namei.c
--- 2/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@@ -1225,8 -1225,8 +1225,8 @@@ static int jfs_rename(struct inode *old
                rc = dtSearch(new_dir, &new_dname, &ino, &btstack,
                              JFS_CREATE);
                if (rc) {
-                       jfs_err("jfs_rename didn't expect dtSearch to fail "
-                               "w/rc = %d", rc);
+                       jfs_err("jfs_rename didn't expect dtSearch to fail w/rc = %d",
+                               rc);
                        goto out_tx;
                }
  
@@@ -1524,7 -1524,7 +1524,7 @@@ struct dentry *jfs_get_parent(struct de
        parent_ino =
                le32_to_cpu(JFS_IP(d_inode(dentry))->i_dtroot.header.idotdot);
  
 -      return d_obtain_alias(jfs_iget(d_inode(dentry)->i_sb, parent_ino));
 +      return d_obtain_alias(jfs_iget(dentry->d_sb, parent_ino));
  }
  
  const struct inode_operations jfs_dir_inode_operations = {

diff --combined fs/jfs/super.c
index 78d599198bf5bdced8624016056e1d1c37f23849,f908012b101a8db1537c19aed4ec8a2993381508..cec8814a3b8becb58cc9b640c3867312e44c2d5a
--- 1/fs/jfs/super.c
--- 2/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@@ -84,7 -84,7 +84,7 @@@ static void jfs_handle_error(struct sup
                panic("JFS (device %s): panic forced after error\n",
                        sb->s_id);
        else if (sbi->flag & JFS_ERR_REMOUNT_RO) {
-               jfs_err("ERROR: (device %s): remounting filesystem as read-only\n",
+               jfs_err("ERROR: (device %s): remounting filesystem as read-only",
                        sb->s_id);
                sb->s_flags |= MS_RDONLY;
        }
@@@ -596,7 -596,7 +596,7 @@@ static int jfs_fill_super(struct super_
         * Page cache is indexed by long.
         * I would use MAX_LFS_FILESIZE, but it's only half as big
         */
 -      sb->s_maxbytes = min(((u64) PAGE_CACHE_SIZE << 32) - 1,
 +      sb->s_maxbytes = min(((u64) PAGE_SIZE << 32) - 1,
                             (u64)sb->s_maxbytes);
  #endif
        sb->s_time_gran = 1;
@@@ -641,7 -641,7 +641,7 @@@ static int jfs_freeze(struct super_bloc
                }
                rc = updateSuper(sb, FM_CLEAN);
                if (rc) {
-                       jfs_err("jfs_freeze: updateSuper failed\n");
+                       jfs_err("jfs_freeze: updateSuper failed");
                        /*
                         * Don't fail here. Everything succeeded except
                         * marking the superblock clean, so there's really