Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-06 05:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: do_last(): common slow lookup

Browse Source 
Make the slow lookup part of O_CREAT and non-O_CREAT opens common.

This allows atomic_open to be hooked into the slow lookup part.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2012-06-05 15:10:14 +02:00 committed by Al Viro
parent b6183df7b2
commit 7157486541
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/namei.c
View File

@ -2250,30 +2250,13 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
symlink_ok = 1; symlink_ok = 1;
/* we _can_ be in RCU mode here */ /* we _can_ be in RCU mode here */
error = lookup_fast(nd, &nd->last, path, &inode); error = lookup_fast(nd, &nd->last, path, &inode);
if (unlikely(error)) { if (likely(!error))
if (error < 0) goto finish_lookup;
goto exit;
BUG_ON(nd->inode != dir->d_inode); if (error < 0)
goto exit;
mutex_lock(&dir->d_inode->i_mutex); BUG_ON(nd->inode != dir->d_inode);
dentry = __lookup_hash(&nd->last, dir, nd);
mutex_unlock(&dir->d_inode->i_mutex);
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit;
path->mnt = nd->path.mnt;
path->dentry = dentry;
error = follow_managed(path, nd->flags);
if (unlikely(error < 0))
goto exit_dput;
if (error)
nd->flags |= LOOKUP_JUMPED;
inode = path->dentry->d_inode;
}
goto finish_lookup;
} else { } else {
/* create side of things */ /* create side of things */
/* /*