1 files changed, 17 insertions, 32 deletions

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index eaaf2b511e89..03787ef6a118 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1456,34 +1456,23 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc
         ino_t inum;
         struct inode *ip;
         struct component_name key;
-        const char *name = dentry->d_name.name;
-        int len = dentry->d_name.len;
         int rc;
 
-        jfs_info("jfs_lookup: name = %s", name);
-
-        if ((name[0] == '.') && (len == 1))
-                inum = dip->i_ino;
-        else if (strcmp(name, "..") == 0)
-                inum = PARENT(dip);
-        else {
-                if ((rc = get_UCSname(&key, dentry)))
-                        return ERR_PTR(rc);
-                rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP);
-                free_UCSname(&key);
-                if (rc == -ENOENT) {
-                        d_add(dentry, NULL);
-                        return NULL;
-                } else if (rc) {
-                        jfs_err("jfs_lookup: dtSearch returned %d", rc);
-                        return ERR_PTR(rc);
-                }
-        }
-
-        ip = jfs_iget(dip->i_sb, inum);
-        if (IS_ERR(ip)) {
-                jfs_err("jfs_lookup: iget failed on inum %d", (uint) inum);
-                return ERR_CAST(ip);
+        jfs_info("jfs_lookup: name = %s", dentry->d_name.name);
+
+        if ((rc = get_UCSname(&key, dentry)))
+                return ERR_PTR(rc);
+        rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP);
+        free_UCSname(&key);
+        if (rc == -ENOENT) {
+                ip = NULL;
+        } else if (rc) {
+                jfs_err("jfs_lookup: dtSearch returned %d", rc);
+                ip = ERR_PTR(rc);
+        } else {
+                ip = jfs_iget(dip->i_sb, inum);
+                if (IS_ERR(ip))
+                        jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
         }
 
         return d_splice_alias(ip, dentry);
@@ -1597,8 +1586,6 @@ out:
 
 static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
-        if (nd && nd->flags & LOOKUP_RCU)
-                return -ECHILD;
         /*
          * This is not negative dentry. Always valid.
          *
@@ -1624,10 +1611,8 @@ static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
          * case sensitive name which is specified by user if this is
          * for creation.
          */
-        if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT))) {
-                if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
-                        return 0;
-        }
+        if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
+                return 0;
         return 1;
 }