Commit 12fa5e24 authored by Al Viro's avatar Al Viro

lookup_open(): expand the call of real_lookup()

... and lose the duplicate IS_DEADDIR() - we'd already checked that.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 384f26e2
...@@ -2969,9 +2969,16 @@ static int lookup_open(struct nameidata *nd, struct path *path, ...@@ -2969,9 +2969,16 @@ static int lookup_open(struct nameidata *nd, struct path *path,
no_open: no_open:
if (need_lookup) { if (need_lookup) {
dentry = lookup_real(dir_inode, dentry, nd->flags); struct dentry *res = dir_inode->i_op->lookup(dir_inode, dentry,
if (IS_ERR(dentry)) nd->flags);
return PTR_ERR(dentry); if (unlikely(res)) {
if (IS_ERR(res)) {
error = PTR_ERR(res);
goto out_dput;
}
dput(dentry);
dentry = res;
}
} }
/* Negative dentry, just create the file */ /* Negative dentry, just create the file */
......
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