Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359160
b: refs/heads/master
c: cc2a527
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Feb 23, 2013
1 parent ca76e7b commit 1871cd8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e97cdc87be5804eb2922e169f6d81d3e214587ec
refs/heads/master: cc2a5271155a108c9c6a8d70ec4e4f860f32cd07
7 changes: 3 additions & 4 deletions trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1436,8 +1436,7 @@ static int lookup_fast(struct nameidata *nd,
}

/* 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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 1871cd8

Please sign in to comment.