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

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;
                 }