Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs

[profile/ivi/kernel-x86-ivi.git] / net / ceph / crush / crush.c

diff --git a/net/ceph/crush/crush.c b/net/ceph/crush/crush.c
index 0896132..16bc199 100644 (file)
--- a/net/ceph/crush/crush.c
+++ b/net/ceph/crush/crush.c
@@ -116,11 +116,14 @@ void crush_destroy(struct crush_map *map)
        if (map->rules) {
                __u32 b;
                for (b = 0; b < map->max_rules; b++)
-                       kfree(map->rules[b]);
+                       crush_destroy_rule(map->rules[b]);
                kfree(map->rules);
        }
 
        kfree(map);
 }
 
-
+void crush_destroy_rule(struct crush_rule *rule)
+{
+       kfree(rule);
+}