diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-06-12 12:21:07 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-06-25 10:49:31 +0200 |
| commit | b459be739f97e2062b2ba77cfe8ea198dbd58904 (patch) | |
| tree | 6765018f9d7842f0160b9cd858bd76e8a119491b /net/ceph/crush/hash.c | |
| parent | crush: fix crash from invalid 'take' argument (diff) | |
| download | linux-b459be739f97e2062b2ba77cfe8ea198dbd58904.tar.xz linux-b459be739f97e2062b2ba77cfe8ea198dbd58904.zip | |
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 'net/ceph/crush/hash.c')
| -rw-r--r-- | net/ceph/crush/hash.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ceph/crush/hash.c b/net/ceph/crush/hash.c index 5bb63e37a8a1..ed123af49eba 100644 --- a/net/ceph/crush/hash.c +++ b/net/ceph/crush/hash.c @@ -1,6 +1,8 @@ - -#include <linux/types.h> -#include <linux/crush/hash.h> +#ifdef __KERNEL__ +# include <linux/crush/hash.h> +#else +# include "hash.h" +#endif /* * Robert Jenkins' function for mixing 32-bit values |