diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:28 -0700 |
| commit | d831fd1b46d04e5c8c8a0431c321578d25852695 (patch) | |
| tree | 53a685712d0f0debe66de80c1f0a5e545d0de7e2 /fs/namei.c | |
| parent | c95c4e2a6bb8d44f9a8f59eadd99a9a615c53112 (diff) | |
| parent | 339f8f37f0203884332585e38c06536c8477d475 (diff) | |
Merge tag 'v3.10.55' into linux-linaro-lsklsk-v3.10-14.09
This is the 3.10.55 stable release
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index 6ac16a37ded2..f7c4393f8535 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -34,6 +34,7 @@ #include <linux/device_cgroup.h> #include <linux/fs_struct.h> #include <linux/posix_acl.h> +#include <linux/hash.h> #include <asm/uaccess.h> #include "internal.h" @@ -1647,8 +1648,7 @@ static inline int can_lookup(struct inode *inode) static inline unsigned int fold_hash(unsigned long hash) { - hash += hash >> (8*sizeof(int)); - return hash; + return hash_64(hash, 32); } #else /* 32-bit case */ |