|
@@ -610,33 +610,21 @@ static struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
|
|
int err;
|
|
int err;
|
|
|
|
|
|
inode = hostfs_iget(ino->i_sb);
|
|
inode = hostfs_iget(ino->i_sb);
|
|
- if (IS_ERR(inode)) {
|
|
|
|
- err = PTR_ERR(inode);
|
|
|
|
|
|
+ if (IS_ERR(inode))
|
|
goto out;
|
|
goto out;
|
|
- }
|
|
|
|
|
|
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
name = dentry_name(dentry);
|
|
name = dentry_name(dentry);
|
|
- if (name == NULL)
|
|
|
|
- goto out_put;
|
|
|
|
-
|
|
|
|
- err = read_name(inode, name);
|
|
|
|
-
|
|
|
|
- __putname(name);
|
|
|
|
- if (err == -ENOENT) {
|
|
|
|
|
|
+ if (name) {
|
|
|
|
+ err = read_name(inode, name);
|
|
|
|
+ __putname(name);
|
|
|
|
+ }
|
|
|
|
+ if (err) {
|
|
iput(inode);
|
|
iput(inode);
|
|
- inode = NULL;
|
|
|
|
|
|
+ inode = (err == -ENOENT) ? NULL : ERR_PTR(err);
|
|
}
|
|
}
|
|
- else if (err)
|
|
|
|
- goto out_put;
|
|
|
|
-
|
|
|
|
- d_add(dentry, inode);
|
|
|
|
- return NULL;
|
|
|
|
-
|
|
|
|
- out_put:
|
|
|
|
- iput(inode);
|
|
|
|
out:
|
|
out:
|
|
- return ERR_PTR(err);
|
|
|
|
|
|
+ return d_splice_alias(inode, dentry);
|
|
}
|
|
}
|
|
|
|
|
|
static int hostfs_link(struct dentry *to, struct inode *ino,
|
|
static int hostfs_link(struct dentry *to, struct inode *ino,
|