dcache: subtract d_hash_shift from 32 in advance

Alexey Dobriyan · Al Viro · commit 854d3e63438d · 2018-01-25T19:34:29.000-05:00
Signed-off-by: Alexey Dobriyan &lt;adobriyan@gmail.com&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/dcache.c b/fs/dcache.c
@@ -110,7 +110,7 @@ static struct hlist_bl_head *dentry_hashtable __read_mostly;
 
 static inline struct hlist_bl_head *d_hash(unsigned int hash)
 {
-	return dentry_hashtable + (hash >> (32 - d_hash_shift));
+	return dentry_hashtable + (hash >> d_hash_shift);
 }
 
 #define IN_LOOKUP_SHIFT 10
@@ -3593,6 +3593,7 @@ static void __init dcache_init_early(void)
 					&d_hash_mask,
 					0,
 					0);
+	d_hash_shift = 32 - d_hash_shift;
 }
 
 static void __init dcache_init(void)
@@ -3619,6 +3620,7 @@ static void __init dcache_init(void)
 					&d_hash_mask,
 					0,
 					0);
+	d_hash_shift = 32 - d_hash_shift;
 }
 
 /* SLAB cache for __getname() consumers */

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ static struct hlist_bl_head *dentry_hashtable __read_mostly;`
`110`	`110`
`111`	`111`	`static inline struct hlist_bl_head *d_hash(unsigned int hash)`
`112`	`112`	`{`
`113`		`- return dentry_hashtable + (hash >> (32 - d_hash_shift));`
	`113`	`+ return dentry_hashtable + (hash >> d_hash_shift);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`#define IN_LOOKUP_SHIFT 10`
`@@ -3593,6 +3593,7 @@ static void __init dcache_init_early(void)`
`3593`	`3593`	`&d_hash_mask,`
`3594`	`3594`	`0,`
`3595`	`3595`	`0);`
	`3596`	`+ d_hash_shift = 32 - d_hash_shift;`
`3596`	`3597`	`}`
`3597`	`3598`
`3598`	`3599`	`static void __init dcache_init(void)`
`@@ -3619,6 +3620,7 @@ static void __init dcache_init(void)`
`3619`	`3620`	`&d_hash_mask,`
`3620`	`3621`	`0,`
`3621`	`3622`	`0);`
	`3623`	`+ d_hash_shift = 32 - d_hash_shift;`
`3622`	`3624`	`}`
`3623`	`3625`
`3624`	`3626`	`/* SLAB cache for __getname() consumers */`