diff --git a/[refs] b/[refs] index 8101991d31b6..735aa658a200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa4ee159512ee39b6c65ac40db986ea7a2f7de60 +refs/heads/master: 3637c05d881b2b7bab36f339245b8963f5b29c9f diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 768f2366bddd..82f9568d315d 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1869,9 +1869,7 @@ static struct dentry *__lookup_hash(struct qstr *name, * __lookup_hash is called with the parent dir's i_mutex already * held, so we are good to go here. */ - dentry = d_inode_lookup(base, dentry, nd); - if (IS_ERR(dentry)) - return dentry; + return d_inode_lookup(base, dentry, nd); } if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {