---

yaml --- r: 288531 b: refs/heads/master c: 6d7d1a0 h: refs/heads/master i: 288529: ccbcacd 288527: 19f01ef v: v3
git-mirror · Mar 19, 2012 · bd79303 · bd79303
1 parent 46c4f66
commit bd79303
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c16fa4f2ad19908a47c63d8fa436a1178438c7e7
+refs/heads/master: 6d7d1a0dc735ea8412769edae7154885021107a9
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
@@ -105,10 +105,10 @@ static unsigned int d_hash_shift __read_mostly;
 static struct hlist_bl_head *dentry_hashtable __read_mostly;
 
 static inline struct hlist_bl_head *d_hash(const struct dentry *parent,
-					unsigned long hash)
+					unsigned int hash)
 {
-	hash += ((unsigned long) parent ^ GOLDEN_RATIO_PRIME) / L1_CACHE_BYTES;
-	hash = hash ^ ((hash ^ GOLDEN_RATIO_PRIME) >> D_HASHBITS);
+	hash += (unsigned long) parent / L1_CACHE_BYTES;
+	hash = hash + (hash >> D_HASHBITS);
 	return dentry_hashtable + (hash & D_HASHMASK);
 }