aboutsummaryrefslogtreecommitdiffstats
path: root/fs/namei.c
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 /fs/namei.c
parente97cdc87be5804eb2922e169f6d81d3e214587ec (diff)
lookup_slow: get rid of name argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-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:
1436} 1436}
1437 1437
1438/* Fast lookup failed, do it the slow way */ 1438/* Fast lookup failed, do it the slow way */
1439static int lookup_slow(struct nameidata *nd, struct qstr *name, 1439static int lookup_slow(struct nameidata *nd, struct path *path)
1440 struct path *path)
1441{ 1440{
1442 struct dentry *dentry, *parent; 1441 struct dentry *dentry, *parent;
1443 int err; 1442 int err;
@@ -1446,7 +1445,7 @@ static int lookup_slow(struct nameidata *nd, struct qstr *name,
1446 BUG_ON(nd->inode != parent->d_inode); 1445 BUG_ON(nd->inode != parent->d_inode);
1447 1446
1448 mutex_lock(&parent->d_inode->i_mutex); 1447 mutex_lock(&parent->d_inode->i_mutex);
1449 dentry = __lookup_hash(name, parent, nd->flags); 1448 dentry = __lookup_hash(&nd->last, parent, nd->flags);
1450 mutex_unlock(&parent->d_inode->i_mutex); 1449 mutex_unlock(&parent->d_inode->i_mutex);
1451 if (IS_ERR(dentry)) 1450 if (IS_ERR(dentry))
1452 return PTR_ERR(dentry); 1451 return PTR_ERR(dentry);
@@ -1535,7 +1534,7 @@ static inline int walk_component(struct nameidata *nd, struct path *path,
1535 if (err < 0) 1534 if (err < 0)
1536 goto out_err; 1535 goto out_err;
1537 1536
1538 err = lookup_slow(nd, &nd->last, path); 1537 err = lookup_slow(nd, path);
1539 if (err < 0) 1538 if (err < 0)
1540 goto out_err; 1539 goto out_err;
1541 1540