diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 14:15:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 14:15:18 -0700 |
| commit | dba1e987312ed318dfd46d4684e9e97b2223f2e8 (patch) | |
| tree | a993fee57793a70775276cfc5bc10442258bf735 /fs/jfs/namei.c | |
| parent | cb6fd68fdd4a94880a99ad8515844c7a25e50d3e (diff) | |
| parent | 6ed71e9819ac3412fc6a3495f5ce141df274c916 (diff) | |
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
Diffstat (limited to 'fs/jfs/namei.c')
| -rw-r--r-- | fs/jfs/namei.c | 4 |
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; } |