osd/OSDMap: drop checks for ruleset == ruleid

This is about to be come impossible.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index f187b10b8cf2b6505a292f842d828d549f9b5c84..7a70b67a16fae3f9bc8fd9a519cf09f009c3c89d 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -4146,23 +4146,10 @@ int OSDMap::validate_crush_rules(CrushWrapper *newcrush,
          << " but it is not present";
       return -EINVAL;
     }
-    if (newcrush->get_rule_mask_ruleset(ruleno) != ruleno) {
-      *ss << "rule " << ruleno << " mask ruleset does not match rule id";
-      return -EINVAL;
-    }
-    if (newcrush->get_rule_mask_type(ruleno) != (int)pool.get_type()) {
+    if (newcrush->get_rule_type(ruleno) != (int)pool.get_type()) {
       *ss << "pool " << i.first << " type does not match rule " << ruleno;
       return -EINVAL;
     }
-    int poolsize = pool.get_size();
-    if (poolsize < newcrush->get_rule_mask_min_size(ruleno) ||
-       poolsize > newcrush->get_rule_mask_max_size(ruleno)) {
-      *ss << "pool " << i.first << " size " << poolsize << " does not"
-         << " fall within rule " << ruleno
-         << " min_size " << newcrush->get_rule_mask_min_size(ruleno)
-         << " and max_size " << newcrush->get_rule_mask_max_size(ruleno);
-      return -EINVAL;
-    }
   }
   return 0;
 }