diff options
Diffstat (limited to 'kernel/net/ceph/crush/crush.c')
| -rw-r--r-- | kernel/net/ceph/crush/crush.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/net/ceph/crush/crush.c b/kernel/net/ceph/crush/crush.c index 9d84ce4ea..80d7c3a97 100644 --- a/kernel/net/ceph/crush/crush.c +++ b/kernel/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); } |