summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-24 18:19:49 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-22 23:31:35 -0500
commitcc2a5271155a108c9c6a8d70ec4e4f860f32cd07 (patch)
tree81f633e2c7dccd6a0738438d135f99fb83ac44de
parente97cdc87be5804eb2922e169f6d81d3e214587ec (diff)
downloadlinux-stable-cc2a5271155a108c9c6a8d70ec4e4f860f32cd07.tar.gz
linux-stable-cc2a5271155a108c9c6a8d70ec4e4f860f32cd07.tar.bz2
linux-stable-cc2a5271155a108c9c6a8d70ec4e4f860f32cd07.zip
lookup_slow: get rid of name argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 27823826a500..052c095c2808 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1436,8 +1436,7 @@ need_lookup:
}
/* Fast lookup failed, do it the slow way */
-static int lookup_slow(struct nameidata *nd, struct qstr *name,
- struct path *path)
+static int lookup_slow(struct nameidata *nd, struct path *path)
{
struct dentry *dentry, *parent;
int err;
@@ -1446,7 +1445,7 @@ static int lookup_slow(struct nameidata *nd, struct qstr *name,
BUG_ON(nd->inode != parent->d_inode);
mutex_lock(&parent->d_inode->i_mutex);
- dentry = __lookup_hash(name, parent, nd->flags);
+ dentry = __lookup_hash(&nd->last, parent, nd->flags);
mutex_unlock(&parent->d_inode->i_mutex);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
@@ -1535,7 +1534,7 @@ static inline int walk_component(struct nameidata *nd, struct path *path,
if (err < 0)
goto out_err;
- err = lookup_slow(nd, &nd->last, path);
+ err = lookup_slow(nd, path);
if (err < 0)
goto out_err;