From e0310ae431871985ecc94c4b76221600833943dd Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 May 2012 12:37:10 -0700
Subject: [PATCH] --- yaml --- r: 300373 b: refs/heads/master c:
 ee983e89670704b2a05e897b161f2674a42d1508 h: refs/heads/master i:   300371:
 71fb54be6df76d47c14cfcc7a4a5eeb94f332c77 v: v3

---
 [refs]            | 2 +-
 trunk/fs/dcache.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 47a57fb55387..6cdf2b8cc930 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94753db5ed9ad97582ef453127d9626a7a2be602
+refs/heads/master: ee983e89670704b2a05e897b161f2674a42d1508
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 5c09ad7b4a15..e6707a1f72c6 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -192,9 +192,6 @@ static inline int dentry_string_cmp(const unsigned char *cs, const unsigned char
 
 static inline int dentry_cmp(const struct dentry *dentry, const unsigned char *ct, unsigned tcount)
 {
-	if (dentry->d_name.len != tcount)
-		return 1;
-
 	/*
 	 * Be careful about RCU walk racing with rename:
 	 * use ACCESS_ONCE to fetch the name pointer.
@@ -1464,6 +1461,8 @@ static struct dentry *__d_instantiate_unique(struct dentry *entry,
 			continue;
 		if (alias->d_parent != entry->d_parent)
 			continue;
+		if (alias->d_name.len != len)
+			continue;
 		if (dentry_cmp(alias, name, len))
 			continue;
 		__dget(alias);
@@ -1882,6 +1881,8 @@ struct dentry *__d_lookup_rcu(const struct dentry *parent,
 			}
 		}
 
+		if (dentry->d_name.len != len)
+			continue;
 		if (!dentry_cmp(dentry, str, len))
 			return dentry;
 	}
@@ -1984,6 +1985,8 @@ struct dentry *__d_lookup(struct dentry *parent, struct qstr *name)
 						tlen, tname, name))
 				goto next;
 		} else {
+			if (dentry->d_name.len != len)
+				goto next;
 			if (dentry_cmp(dentry, str, len))
 				goto next;
 		}