diff options
| author | Ilya Dryomov | 2015-06-12 12:21:07 +0200 |
|---|---|---|
| committer | Ilya Dryomov | 2015-06-25 10:49:31 +0200 |
| commit | b459be739f97e2062b2ba77cfe8ea198dbd58904 (patch) | |
| tree | 6765018f9d7842f0160b9cd858bd76e8a119491b /net/ceph/crush/crush.c | |
| parent | crush: fix crash from invalid 'take' argument (diff) | |
| download | kernel-qcow2-linux-b459be739f97e2062b2ba77cfe8ea198dbd58904.tar.gz kernel-qcow2-linux-b459be739f97e2062b2ba77cfe8ea198dbd58904.tar.xz kernel-qcow2-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/crush.c')
| -rw-r--r-- | net/ceph/crush/crush.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/ceph/crush/crush.c b/net/ceph/crush/crush.c index 9d84ce4ea0df..80d7c3a97cb8 100644 --- a/net/ceph/crush/crush.c +++ b/net/ceph/crush/crush.c @@ -1,15 +1,11 @@ - #ifdef __KERNEL__ # include <linux/slab.h> +# include <linux/crush/crush.h> #else -# include <stdlib.h> -# include <assert.h> -# define kfree(x) do { if (x) free(x); } while (0) -# define BUG_ON(x) assert(!(x)) +# include "crush_compat.h" +# include "crush.h" #endif -#include <linux/crush/crush.h> - const char *crush_bucket_alg_name(int alg) { switch (alg) { @@ -134,6 +130,9 @@ void crush_destroy(struct crush_map *map) kfree(map->rules); } +#ifndef __KERNEL__ + kfree(map->choose_tries); +#endif kfree(map); } |