diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2015-06-12 13:21:07 +0300 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-06-25 11:49:31 +0300 |
| commit | b459be739f97e2062b2ba77cfe8ea198dbd58904 (patch) | |
| tree | 6765018f9d7842f0160b9cd858bd76e8a119491b /include/linux/crush/mapper.h | |
| parent | crush: fix crash from invalid 'take' argument (diff) | |
| download | linux-dev-b459be739f97e2062b2ba77cfe8ea198dbd58904.tar.xz linux-dev-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 'include/linux/crush/mapper.h')
| -rw-r--r-- | include/linux/crush/mapper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/crush/mapper.h b/include/linux/crush/mapper.h index eab367446eea..5dfd5b1125d2 100644 --- a/include/linux/crush/mapper.h +++ b/include/linux/crush/mapper.h @@ -8,7 +8,7 @@ * LGPL2 */ -#include <linux/crush/crush.h> +#include "crush.h" extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size); extern int crush_do_rule(const struct crush_map *map, |