crush: remove find_rule()

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index d33d4bcf445ddcd0c7ae784384b2beada4cdd91b..30e278a6404c795a40264b828487f7192df48f86 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -1402,19 +1402,6 @@ public:
     crush->max_devices = m;
   }
 
-  int find_rule(int ruleset, int type, int size) const {
-    if (!crush) return -1;
-    if (have_uniform_rules &&
-       ruleset < (int)crush->max_rules &&
-       crush->rules[ruleset] &&
-       crush->rules[ruleset]->mask.type == type &&
-       crush->rules[ruleset]->mask.min_size <= size &&
-       crush->rules[ruleset]->mask.max_size >= size) {
-      return ruleset;
-    }
-    return crush_find_rule(crush, ruleset, type, size);
-  }
-
   bool ruleset_exists(const int ruleset) const {
     for (size_t i = 0; i < crush->max_rules; ++i) {
       if (rule_exists(i) && crush->rules[i]->mask.ruleset == ruleset) {

diff --git a/src/crush/mapper.c b/src/crush/mapper.c
index 4ac57262716a5f2887f7ec03a377bedef89b76f7..736cc6162c9747cbab80dcf5b9413a72d7c31f86 100644 (file)
--- a/src/crush/mapper.c
+++ b/src/crush/mapper.c
@@ -31,28 +31,6 @@
  * Implement the core CRUSH mapping algorithm.
  */
 
-/**
- * crush_find_rule - find a crush_rule id for a given ruleset, type, and size.
- * @map: the crush_map
- * @ruleset: the storage ruleset id (user defined)
- * @type: storage ruleset type (user defined)
- * @size: output set size
- */
-int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size)
-{
-       __u32 i;
-
-       for (i = 0; i < map->max_rules; i++) {
-               if (map->rules[i] &&
-                   map->rules[i]->mask.ruleset == ruleset &&
-                   map->rules[i]->mask.type == type &&
-                   map->rules[i]->mask.min_size <= size &&
-                   map->rules[i]->mask.max_size >= size)
-                       return i;
-       }
-       return -1;
-}
-
 /*
  * bucket choose methods
  *

diff --git a/src/crush/mapper.h b/src/crush/mapper.h
index 2332d4b511f288bf727f2de9c190e636f4f1545c..0ec927d9e6162e3d5b1a3b4cc2e539c7b028f065 100644 (file)
--- a/src/crush/mapper.h
+++ b/src/crush/mapper.h
@@ -10,7 +10,6 @@
 
 #include "crush.h"
 
-extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size);
 /** @ingroup API
  *
  * Map __x__ to __result_max__ items and store them in the __result__