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

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 8a40941ac9a6..ff671edcf4f0 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1225,8 +1225,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 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;
                 }