commit b459be739f97e2062b2ba77cfe8ea198dbd58904
author Ilya Dryomov <idryomov@gmail.com> Fri Jun 12 13:21:07 2015 +0300
committer Ilya Dryomov <idryomov@gmail.com> Thu Jun 25 11:49:31 2015 +0300
tree 6765018f9d7842f0160b9cd858bd76e8a119491b
parent 8f529795bace5d6263b134f4ff3adccfc0a0cce6

crush: sync up with userspace

.. up to ceph.git commit 1db1abc8328d ("crush: eliminate ad hoc diff
between kernel and userspace").  This fixes a bunch of recently pulled
coding style issues and makes includes a bit cleaner.

A patch "crush:Make the function crush_ln static" from Nicholas Krause
<xerofoify@gmail.com> is folded in as crush_ln() has been made static
in userspace as well.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

include/linux/crush/hash.h

diff --git a/include/linux/crush/hash.h b/include/linux/crush/hash.h
index 91e8842..d1d9025 100644
--- a/include/linux/crush/hash.h
+++ b/include/linux/crush/hash.h
@@ -1,6 +1,12 @@
 #ifndef CEPH_CRUSH_HASH_H
 #define CEPH_CRUSH_HASH_H
 
+#ifdef __KERNEL__
+# include <linux/types.h>
+#else
+# include "crush_compat.h"
+#endif
+
 #define CRUSH_HASH_RJENKINS1   0
 
 #define CRUSH_HASH_DEFAULT CRUSH_HASH_RJENKINS1