---

yaml --- r: 298369 b: refs/heads/master c: 3637c05 h: refs/heads/master i: 298367: 82e8cc8 v: v3
git-mirror · Mar 31, 2012 · 328d0de · 328d0de
1 parent f4da645
commit 328d0de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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)) {