diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 10:19:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 10:19:34 -0700 |
| commit | 9db019278cad416681e27b15203d4c5e939c315b (patch) | |
| tree | e0c7e440af4444176a34320e18df8d623201dad5 /fs/jfs/namei.c | |
| parent | Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | jfs: Update jfs_error (diff) | |
| download | linux-dev-9db019278cad416681e27b15203d4c5e939c315b.tar.xz linux-dev-9db019278cad416681e27b15203d4c5e939c315b.zip | |
Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from Dave Kleikamp:
"A couple cleanups to JFS for 3.11"
* tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy:
jfs: Update jfs_error
jfs: fix sparse warning in fs/jfs/xattr.c
Diffstat (limited to 'fs/jfs/namei.c')
| -rw-r--r-- | fs/jfs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 8b19027291d6..aa8a3370631b 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -1176,7 +1176,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry, if (!S_ISDIR(old_ip->i_mode) && new_ip) IWRITE_UNLOCK(new_ip); jfs_error(new_ip->i_sb, - "jfs_rename: new_ip->i_nlink != 0"); + "new_ip->i_nlink != 0\n"); return -EIO; } tblk = tid_to_tblock(tid); |