OSDN Git Service

lookup_slow: get rid of name argument
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 24 Jan 2013 23:19:49 +0000 (18:19 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 23 Feb 2013 04:31:35 +0000 (23:31 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/namei.c

index 2782382..052c095 100644 (file)
@@ -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;