summary refs log tree commit diff
path: root/fs/jfs/namei.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-01-25 12:20:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-01-25 12:20:32 -0800
commit2d94dfc8c38edf63e91e48fd55c3a8822b6a9ced (patch)
treecbb8ab94e53deb22970094db374ab3494345ab3a /fs/jfs/namei.c
parentb47711bfbcd4eb77ca61ef0162487b20e023ae55 (diff)
parent5c5e32ceeb6b64496a1842d5d99e4ac8d20166c4 (diff)
downloadlinux-2d94dfc8c38edf63e91e48fd55c3a8822b6a9ced.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  mount options: fix jfs
  JFS: simplify types to get rid of sparse warning
  JFS: FIx one more plain integer as NULL pointer warning
  JFS: Remove defconfig ptr comparison to 0
  JFS: use DIV_ROUND_UP where appropriate
  Remove unnecessary kmalloc casts in the jfs filesystem
  JFS is missing a memory barrier
  JFS: Make sure special inode data is written after journal is flushed
  JFS: clear PAGECACHE_TAG_DIRTY for no-write pages
Diffstat (limited to 'fs/jfs/namei.c')
-rw-r--r--fs/jfs/namei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 4e0a8493cef6..f8718de3505e 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1103,8 +1103,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	 * Make sure dest inode number (if any) is what we think it is
 	 */
 	rc = dtSearch(new_dir, &new_dname, &ino, &btstack, JFS_LOOKUP);
-	if (rc == 0) {
-		if ((new_ip == 0) || (ino != new_ip->i_ino)) {
+	if (!rc) {
+		if ((!new_ip) || (ino != new_ip->i_ino)) {
 			rc = -ESTALE;
 			goto out3;
 		}