Commit 54ef4872 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro

vfs: lookup_open(): expand lookup_hash()

Copy __lookup_hash() into lookup_open().  The next patch will insert the atomic
open call just before the real lookup.
Signed-off-by: default avatarMiklos Szeredi <>
Signed-off-by: default avatarAl Viro <>
parent d58ffd35
......@@ -2209,14 +2209,24 @@ static struct file *lookup_open(struct nameidata *nd, struct path *path,
int *want_write, bool *created)
struct dentry *dir = nd->path.dentry;
struct inode *dir_inode = dir->d_inode;
struct dentry *dentry;
int error;
bool need_lookup;
*created = false;
dentry = lookup_hash(nd);
dentry = lookup_dcache(&nd->last, dir, nd, &need_lookup);
if (IS_ERR(dentry))
return ERR_CAST(dentry);
if (need_lookup) {
dentry = lookup_real(dir_inode, dentry, nd);
if (IS_ERR(dentry))
return ERR_CAST(dentry);
/* Negative dentry, just create the file */
if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
umode_t mode = op->mode;
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