update ceph source to reef 18.2.1

[ceph.git] / ceph / src / crimson / osd / osd_operations / replicated_request.cc

diff --git a/ceph/src/crimson/osd/osd_operations/replicated_request.cc b/ceph/src/crimson/osd/osd_operations/replicated_request.cc
index f7d4fa68b2b30443836c191c9d2665bbdb980321..09217575c8ff31a94dd3277a5752f1ea1db78646 100644 (file)
--- a/ceph/src/crimson/osd/osd_operations/replicated_request.cc
+++ b/ceph/src/crimson/osd/osd_operations/replicated_request.cc
@@ -21,7 +21,7 @@ namespace crimson::osd {
 RepRequest::RepRequest(crimson::net::ConnectionRef&& conn,
                       Ref<MOSDRepOp> &&req)
   : conn{std::move(conn)},
-    req{req}
+    req{std::move(req)}
 {}
 
 void RepRequest::print(std::ostream& os) const
@@ -49,7 +49,7 @@ ConnectionPipeline &RepRequest::get_connection_pipeline()
   return get_osd_priv(conn.get()).replicated_request_conn_pipeline;
 }
 
-ClientRequest::PGPipeline &RepRequest::pp(PG &pg)
+ClientRequest::PGPipeline &RepRequest::client_pp(PG &pg)
 {
   return pg.request_pg_pipeline;
 }
@@ -61,7 +61,7 @@ seastar::future<> RepRequest::with_pg(
   IRef ref = this;
   return interruptor::with_interruption([this, pg] {
     logger().debug("{}: pg present", *this);
-    return this->template enter_stage<interruptor>(pp(*pg).await_map
+    return this->template enter_stage<interruptor>(client_pp(*pg).await_map
     ).then_interruptible([this, pg] {
       return this->template with_blocking_event<
         PG_OSDMapGate::OSDMapBlocker::BlockingEvent