Merge branch 'v3.10/topic/mm-timer' into linux-linaro-lsk-v3.10

[firefly-linux-kernel-4.4.55.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 6ac16a37ded29dea1d9d1335626540ab50c4ffab..f7c4393f853533da6a7f4fb459896e596345b131 100644 (file)
--- 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 */