From 1871cd8f6d6b6239cdb92a005efb0670423898a4 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 24 Jan 2013 18:19:49 -0500 Subject: [PATCH] --- yaml --- r: 359160 b: refs/heads/master c: cc2a5271155a108c9c6a8d70ec4e4f860f32cd07 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c9bad7485575..fb5ce3d99751 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e97cdc87be5804eb2922e169f6d81d3e214587ec +refs/heads/master: cc2a5271155a108c9c6a8d70ec4e4f860f32cd07 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 27823826a500..052c095c2808 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -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; @@ -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;