From bd79303085825c4262885152d3205ed27c33a96e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 19 Mar 2012 16:19:53 -0700 Subject: [PATCH] --- yaml --- r: 288531 b: refs/heads/master c: 6d7d1a0dc735ea8412769edae7154885021107a9 h: refs/heads/master i: 288529: ccbcacd55127058601c94e30c22116408669213c 288527: 19f01ef6ec1cd91404b03f6d7d3d5b1f6cfb6538 v: v3 --- [refs] | 2 +- trunk/fs/dcache.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b764399844a8..55288a4b341c 100644 --- 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 index bcbdb33fcc20..5f00a6f63c9e 100644 --- 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); }