diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-25 16:41:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-17 09:04:02 -0700 |
| commit | a6c56468b3f3274896ee8da73608dc48ad4103e0 (patch) | |
| tree | 3d0f2ae53c5f1d2eb8b5460132dbffb5b52a211e | |
| parent | 70efec16cf060603b54ea71c9cb4499f052efd69 (diff) | |
| download | lwn-a6c56468b3f3274896ee8da73608dc48ad4103e0.tar.gz lwn-a6c56468b3f3274896ee8da73608dc48ad4103e0.zip | |
dcache.c: get rid of pointless macros
commit 482db9066199813d6b999b65a3171afdbec040b6 upstream.
D_HASH{MASK,BITS} are used once each, both in the same function (d_hash()).
At this point they are actively misguiding - they imply that values are
compiler constants, which is no longer true.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/dcache.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 9a59653d3449..f867c53a7989 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -96,8 +96,6 @@ static struct kmem_cache *dentry_cache __read_mostly; * This hash-function tries to avoid losing too many bits of hash * information, yet avoid using a prime hash-size or similar. */ -#define D_HASHBITS d_hash_shift -#define D_HASHMASK d_hash_mask static unsigned int d_hash_mask __read_mostly; static unsigned int d_hash_shift __read_mostly; @@ -108,8 +106,8 @@ static inline struct hlist_bl_head *d_hash(const struct dentry *parent, unsigned int hash) { hash += (unsigned long) parent / L1_CACHE_BYTES; - hash = hash + (hash >> D_HASHBITS); - return dentry_hashtable + (hash & D_HASHMASK); + hash = hash + (hash >> d_hash_shift); + return dentry_hashtable + (hash & d_hash_mask); } /* Statistics gathering. */ |