Commit 79ac5a46 authored by Al Viro's avatar Al Viro

jfs_lookup(): don't bother with . or ..

they'll never be passed to ->lookup()
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 10d9f309
...@@ -1456,33 +1456,24 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc ...@@ -1456,33 +1456,24 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc
ino_t inum; ino_t inum;
struct inode *ip; struct inode *ip;
struct component_name key; struct component_name key;
const char *name = dentry->d_name.name;
int len = dentry->d_name.len;
int rc; int rc;
jfs_info("jfs_lookup: name = %s", name); jfs_info("jfs_lookup: name = %s", dentry->d_name.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))) if ((rc = get_UCSname(&key, dentry)))
return ERR_PTR(rc); return ERR_PTR(rc);
rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP); rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP);
free_UCSname(&key); free_UCSname(&key);
if (rc == -ENOENT) { if (rc == -ENOENT) {
d_add(dentry, NULL); ip = NULL;
return NULL;
} else if (rc) { } else if (rc) {
jfs_err("jfs_lookup: dtSearch returned %d", rc); jfs_err("jfs_lookup: dtSearch returned %d", rc);
return ERR_PTR(rc); ip = ERR_PTR(rc);
} } else {
}
ip = jfs_iget(dip->i_sb, inum); ip = jfs_iget(dip->i_sb, inum);
if (IS_ERR(ip)) if (IS_ERR(ip))
jfs_err("jfs_lookup: iget failed on inum %d", (uint) inum); jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
}
return d_splice_alias(ip, dentry); return d_splice_alias(ip, dentry);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment