update sources to v12.1.1

[ceph.git] / ceph / src / osd / ECBackend.cc

diff --git a/ceph/src/osd/ECBackend.cc b/ceph/src/osd/ECBackend.cc
index c35bf1ae21c8d3ee61eafbe60750a9343ff60e33..166edc65996f96749c497ff7e68ee5f1cec527ea 100644 (file)
--- a/ceph/src/osd/ECBackend.cc
+++ b/ceph/src/osd/ECBackend.cc
@@ -689,7 +689,7 @@ void ECBackend::run_recovery_op(
   delete _h;
 }
 
-void ECBackend::recover_object(
+int ECBackend::recover_object(
   const hobject_t &hoid,
   eversion_t v,
   ObjectContextRef head,
@@ -730,6 +730,7 @@ void ECBackend::recover_object(
     }
   }
   dout(10) << __func__ << ": built op " << h->ops.back() << dendl;
+  return 0;
 }
 
 bool ECBackend::can_handle_while_inactive(
@@ -1003,8 +1004,7 @@ void ECBackend::handle_sub_read(
        ghobject_t(i->first, ghobject_t::NO_GEN, shard),
        j->get<0>(),
        j->get<1>(),
-       bl, j->get<2>(),
-       true); // Allow EIO return
+       bl, j->get<2>());
       if (r < 0) {
        get_parent()->clog_error() << __func__
                                   << ": Error " << r
@@ -2403,7 +2403,7 @@ void ECBackend::be_deep_scrub(
        poid, ghobject_t::NO_GEN, get_parent()->whoami_shard().shard),
       pos,
       stride, bl,
-      fadvise_flags, true);
+      fadvise_flags);
     if (r < 0)
       break;
     if (bl.length() % sinfo.get_chunk_size()) {