projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
jfs
/
namei.c
diff --git
a/fs/jfs/namei.c
b/fs/jfs/namei.c
index 7040062cb050616fd5ffc9e1a0abfe82b6256ccd..539deddecbb037618d8944236ced8e730785fba5 100644
(file)
--- 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;
}