update ceph source to reef 18.2.1

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

diff --git a/ceph/src/crimson/osd/osd_operations/peering_event.cc b/ceph/src/crimson/osd/osd_operations/peering_event.cc
index b323b4a817bf29262c75b38001bb154cd8d6976a..ea4662bd01e0b72b9680bd8d1f4eac2584966569 100644 (file)
--- a/ceph/src/crimson/osd/osd_operations/peering_event.cc
+++ b/ceph/src/crimson/osd/osd_operations/peering_event.cc
@@ -54,7 +54,7 @@ void PeeringEvent<T>::dump_detail(Formatter *f) const
 
 
 template <class T>
-PGPeeringPipeline &PeeringEvent<T>::pp(PG &pg)
+PGPeeringPipeline &PeeringEvent<T>::peering_pp(PG &pg)
 {
   return pg.peering_request_pg_pipeline;
 }
@@ -73,7 +73,7 @@ seastar::future<> PeeringEvent<T>::with_pg(
   using interruptor = typename T::interruptor;
   return interruptor::with_interruption([this, pg, &shard_services] {
     logger().debug("{}: pg present", *this);
-    return this->template enter_stage<interruptor>(pp(*pg).await_map
+    return this->template enter_stage<interruptor>(peering_pp(*pg).await_map
     ).then_interruptible([this, pg] {
       return this->template with_blocking_event<
        PG_OSDMapGate::OSDMapBlocker::BlockingEvent
@@ -82,7 +82,7 @@ seastar::future<> PeeringEvent<T>::with_pg(
            std::move(trigger), evt.get_epoch_sent());
        });
     }).then_interruptible([this, pg](auto) {
-      return this->template enter_stage<interruptor>(pp(*pg).process);
+      return this->template enter_stage<interruptor>(peering_pp(*pg).process);
     }).then_interruptible([this, pg, &shard_services] {
       return pg->do_peering_event(evt, ctx
       ).then_interruptible([this, pg, &shard_services] {