OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vfs: do_last(): inline lookup_slow() 

Copy lookup_slow() into do_last().

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:12 +02:00 committed by Al Viro
parent 6d7b5aaed7
commit 37d7fffc9c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/namei.c
View File

@ -2254,9 +2254,22 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (error < 0)
goto exit;
error = lookup_slow(nd, &nd->last, path);
if (error < 0)
BUG_ON(nd->inode != dir->d_inode);
mutex_lock(&dir->d_inode->i_mutex);
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;
}