summaryrefslogtreecommitdiff
path: root/include/linux/crush/hash.h
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2015-06-12 13:21:07 +0300
committerIlya Dryomov <idryomov@gmail.com>2015-06-25 11:49:31 +0300
commitb459be739f97e2062b2ba77cfe8ea198dbd58904 (patch)
tree6765018f9d7842f0160b9cd858bd76e8a119491b /include/linux/crush/hash.h
parent8f529795bace5d6263b134f4ff3adccfc0a0cce6 (diff)
downloadlinux-b459be739f97e2062b2ba77cfe8ea198dbd58904.tar.xz
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>
Diffstat (limited to 'include/linux/crush/hash.h')
-rw-r--r--include/linux/crush/hash.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/crush/hash.h b/include/linux/crush/hash.h
index 91e884230d5d..d1d90258242e 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