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>

diff --git a/fs/namei.c b/fs/namei.c
index 6135a14d5a84475ace13c925a57de3f507ab4d2a..68742e3cb98da548df319e86831ebbceca5e7870 100644 (file)
--- 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;
                }