update ceph source to reef 18.2.1

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

diff --git a/ceph/src/crimson/osd/osd_operations/peering_event.h b/ceph/src/crimson/osd/osd_operations/peering_event.h
index d9c9da58a17fcc088d9579ab784c2717830f0976..e94caead199256ac543039fc656f522271bb283c 100644 (file)
--- a/ceph/src/crimson/osd/osd_operations/peering_event.h
+++ b/ceph/src/crimson/osd/osd_operations/peering_event.h
@@ -51,7 +51,7 @@ public:
   static constexpr OperationTypeCode type = OperationTypeCode::peering_event;
 
 protected:
-  PGPeeringPipeline &pp(PG &pg);
+  PGPeeringPipeline &peering_pp(PG &pg);
 
   PeeringCtx ctx;
   pg_shard_t from;