These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / ceph / crush / crush.c

diff --git a/kernel/net/ceph/crush/crush.c b/kernel/net/ceph/crush/crush.c
index 9d84ce4..80d7c3a 100644 (file)
--- 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);
 }