update sources to v12.1.1

[ceph.git] / ceph / src / erasure-code / isa / ErasureCodeIsa.cc

diff --git a/ceph/src/erasure-code/isa/ErasureCodeIsa.cc b/ceph/src/erasure-code/isa/ErasureCodeIsa.cc
index 4a6841abd6226e35bc7186afd66e1468c38b20d4..46c8e830173aecaea5edcecbb4e44f24d4a8c747 100644 (file)
--- a/ceph/src/erasure-code/isa/ErasureCodeIsa.cc
+++ b/ceph/src/erasure-code/isa/ErasureCodeIsa.cc
@@ -19,8 +19,7 @@
 #include "common/debug.h"
 #include "ErasureCodeIsa.h"
 #include "xor_op.h"
-#include "crush/CrushWrapper.h"
-#include "osd/osd_types.h"
+#include "include/assert.h"
 using namespace std;
 
 // -----------------------------------------------------------------------------
@@ -46,26 +45,6 @@ _prefix(std::ostream* _dout)
 const std::string ErasureCodeIsaDefault::DEFAULT_K("7");
 const std::string ErasureCodeIsaDefault::DEFAULT_M("3");
 
-int
-ErasureCodeIsa::create_ruleset(const string &name,
-                               CrushWrapper &crush,
-                               ostream *ss) const
-{
-  int ruleid = crush.add_simple_rule(
-    name,
-    ruleset_root,
-    ruleset_failure_domain,
-    "indep",
-    pg_pool_t::TYPE_ERASURE,
-    ss);
-
-  if (ruleid < 0)
-    return ruleid;
-  else {
-    crush.set_rule_mask_max_size(ruleid, get_chunk_count());
-    return crush.get_rule_mask_ruleset(ruleid);
-  }
-}
 
 // -----------------------------------------------------------------------------
 
@@ -73,18 +52,11 @@ int
 ErasureCodeIsa::init(ErasureCodeProfile &profile, ostream *ss)
 {
   int err = 0;
-  err |= to_string("ruleset-root", profile,
-                  &ruleset_root,
-                  DEFAULT_RULESET_ROOT, ss);
-  err |= to_string("ruleset-failure-domain", profile,
-                  &ruleset_failure_domain,
-                  DEFAULT_RULESET_FAILURE_DOMAIN, ss);
   err |= parse(profile, ss);
   if (err)
     return err;
   prepare();
-  ErasureCode::init(profile, ss);
-  return err;
+  return ErasureCode::init(profile, ss);
 }
 
 // -----------------------------------------------------------------------------