diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2012-06-05 15:10:12 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 14:32:58 +0200 |
| commit | 37d7fffc9cafe75ded8a840fa30ba625f99ed7ae (patch) | |
| tree | 100cebbacea20ddef447ccb4485104ff87b37aeb /fs/namei.c | |
| parent | namei.c: let follow_link() do put_link() on failure (diff) | |
| download | linux-37d7fffc9cafe75ded8a840fa30ba625f99ed7ae.tar.xz linux-37d7fffc9cafe75ded8a840fa30ba625f99ed7ae.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index 6135a14d5a84..68742e3cb98d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -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; } |