update sources to v12.1.1

[ceph.git] / ceph / src / erasure-code / jerasure / ErasureCodeJerasure.cc

diff --git a/ceph/src/erasure-code/jerasure/ErasureCodeJerasure.cc b/ceph/src/erasure-code/jerasure/ErasureCodeJerasure.cc
index ca1b09649f7a7c1b1a88a9c300a31c0f996428cd..599073eb3f73e59d482e77960b145d36e197502f 100644 (file)
--- a/ceph/src/erasure-code/jerasure/ErasureCodeJerasure.cc
+++ b/ceph/src/erasure-code/jerasure/ErasureCodeJerasure.cc
@@ -17,8 +17,6 @@
 
 #include "common/debug.h"
 #include "ErasureCodeJerasure.h"
-#include "crush/CrushWrapper.h"
-#include "osd/osd_types.h"
 
 using namespace std;
 
@@ -42,38 +40,17 @@ static ostream& _prefix(std::ostream* _dout)
   return *_dout << "ErasureCodeJerasure: ";
 }
 
-int ErasureCodeJerasure::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);
-  }
-}
 
 int ErasureCodeJerasure::init(ErasureCodeProfile& profile, ostream *ss)
 {
   int err = 0;
   dout(10) << "technique=" << technique << dendl;
   profile["technique"] = technique;
-  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);
 }
 
 int ErasureCodeJerasure::parse(ErasureCodeProfile &profile,