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>

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;
                 }