From 412de3bcebab844d4dcf75199488236b2292bd3d Mon Sep 17 00:00:00 2001
From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Tue, 13 Nov 2007 22:25:41 -0600
Subject: [PATCH] --- yaml --- r: 76105 b: refs/heads/master c:
 da8a41d19233c2bdcc59447aedc808fcdaabf5b7 h: refs/heads/master i:   76103:
 919c94baf73f966fca476cf99a9a20ba80f7ac28 v: v3

---
 [refs]               | 2 +-
 trunk/fs/jfs/namei.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d482b6ebe2e..29f84f59119a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09aaa749f637b19c308464c2b65a001e67c2a16c
+refs/heads/master: da8a41d19233c2bdcc59447aedc808fcdaabf5b7
diff --git a/trunk/fs/jfs/namei.c b/trunk/fs/jfs/namei.c
index d6e5ebad739a..f8718de3505e 100644
--- a/trunk/fs/jfs/namei.c
+++ b/trunk/fs/jfs/namei.c
@@ -1104,7 +1104,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	 */
 	rc = dtSearch(new_dir, &new_dname, &ino, &btstack, JFS_LOOKUP);
 	if (!rc) {
-		if ((new_ip == 0) || (ino != new_ip->i_ino)) {
+		if ((!new_ip) || (ino != new_ip->i_ino)) {
 			rc = -ESTALE;
 			goto out3;
 		}