From 22adfcc9b43dbd90cd0da9fedaf7da33ba00e305 Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Sun, 25 Dec 2022 11:24:36 +0000
Subject: [PATCH] crimson/osd/*recovery_backend: Rename PullInfo to pull_info_t

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---
 src/crimson/osd/recovery_backend.h             | 4 ++--
 src/crimson/osd/replicated_recovery_backend.cc | 4 ++--
 src/crimson/osd/replicated_recovery_backend.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/crimson/osd/recovery_backend.h b/src/crimson/osd/recovery_backend.h
index 5be55564ad053..9fd83c39942ad 100644
--- a/src/crimson/osd/recovery_backend.h
+++ b/src/crimson/osd/recovery_backend.h
@@ -99,7 +99,7 @@ protected:
   crimson::os::CollectionRef coll;
   PGBackend* backend;
 
-  struct PullInfo {
+  struct pull_info_t {
     pg_shard_t from;
     hobject_t soid;
     ObjectRecoveryProgress recovery_progress;
@@ -130,7 +130,7 @@ public:
     static constexpr const char* type_name = "WaitForObjectRecovery";
 
     crimson::osd::ObjectContextRef obc;
-    std::optional<PullInfo> pi;
+    std::optional<pull_info_t> pi;
     std::map<pg_shard_t, PushInfo> pushing;
 
     seastar::future<> wait_for_readable() {
diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 0d90abff75deb..8fb23eeed88ea 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -115,7 +115,7 @@ ReplicatedRecoveryBackend::maybe_pull_missing_obj(
   }
   PullOp po;
   auto& recovery_waiter = get_recovering(soid);
-  recovery_waiter.pi = std::make_optional<RecoveryBackend::PullInfo>();
+  recovery_waiter.pi = std::make_optional<RecoveryBackend::pull_info_t>();
   auto& pi = *recovery_waiter.pi;
   prepare_pull(po, pi, soid, need);
   auto msg = crimson::make_message<MOSDPGPull>();
@@ -337,7 +337,7 @@ ReplicatedRecoveryBackend::prep_push(
   });
 }
 
-void ReplicatedRecoveryBackend::prepare_pull(PullOp& po, PullInfo& pi,
+void ReplicatedRecoveryBackend::prepare_pull(PullOp& po, pull_info_t& pi,
   const hobject_t& soid,
   eversion_t need) {
   logger().debug("{}: {}, {}", __func__, soid, need);
diff --git a/src/crimson/osd/replicated_recovery_backend.h b/src/crimson/osd/replicated_recovery_backend.h
index a758727720321..17f874d277afa 100644
--- a/src/crimson/osd/replicated_recovery_backend.h
+++ b/src/crimson/osd/replicated_recovery_backend.h
@@ -53,7 +53,7 @@ protected:
     pg_shard_t pg_shard);
   void prepare_pull(
     PullOp& po,
-    PullInfo& pi,
+    pull_info_t& pi,
     const hobject_t& soid,
     eversion_t need);
   std::vector<pg_shard_t> get_shards_to_push(
-- 
2.39.5