提交 9d0728e1 编写于 作者: A Al Viro

atomic_open(): consolidate "overridden ENOENT" in open-yourself cases

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 5249e411
......@@ -2908,13 +2908,6 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
}
if (*opened & FILE_CREATED)
fsnotify_create(dir, dentry);
if (!dentry->d_inode) {
WARN_ON(*opened & FILE_CREATED);
if (create_error) {
error = create_error;
goto out;
}
}
goto looked_up;
}
......@@ -2942,11 +2935,11 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
if (IS_ERR(dentry))
return PTR_ERR(dentry);
}
looked_up:
if (create_error && !dentry->d_inode) {
error = create_error;
goto out;
}
looked_up:
path->dentry = dentry;
path->mnt = nd->path.mnt;
return 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册