osd/ReplicatedBackend: Rename PullInfo to pull_info_t

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 22bf4aea0f5f723dd7e90d99bcfb284315bba9c7..b24135fc3c448ca7b10e6f2a660f6ab51b538815 100644 (file)
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -1450,7 +1450,7 @@ void ReplicatedBackend::prepare_pull(
 
   ceph_assert(!pulling.count(soid));
   pull_from_peer[fromshard].insert(soid);
-  PullInfo &pi = pulling[soid];
+  pull_info_t &pi = pulling[soid];
   pi.from = fromshard;
   pi.soid = soid;
   pi.head_ctx = headctx;
@@ -1798,7 +1798,7 @@ bool ReplicatedBackend::handle_pull_response(
     return false;
   }
 
-  PullInfo &pi = piter->second;
+  pull_info_t &pi = piter->second;
   if (pi.recovery_info.size == (uint64_t(-1))) {
     pi.recovery_info.size = pop.recovery_info.size;
     pi.recovery_info.copy_subset.intersection_of(
@@ -2349,7 +2349,7 @@ void ReplicatedBackend::_failed_pull(pg_shard_t from, const hobject_t &soid)
 }
 
 void ReplicatedBackend::clear_pull_from(
-  map<hobject_t, PullInfo>::iterator piter)
+  map<hobject_t, pull_info_t>::iterator piter)
 {
   auto from = piter->second.from;
   pull_from_peer[from].erase(piter->second.soid);
@@ -2358,7 +2358,7 @@ void ReplicatedBackend::clear_pull_from(
 }
 
 void ReplicatedBackend::clear_pull(
-  map<hobject_t, PullInfo>::iterator piter,
+  map<hobject_t, pull_info_t>::iterator piter,
   bool clear_pull_from_peer)
 {
   if (clear_pull_from_peer) {

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index f5d29fbdfc8239a8ba0098ad87c26b94f43d37ba..6f61aef37243f18c920d2fd632d97b05c29bf928 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -187,7 +187,7 @@ private:
   std::map<hobject_t, std::map<pg_shard_t, PushInfo>> pushing;
 
   // pull
-  struct PullInfo {
+  struct pull_info_t {
     pg_shard_t from;
     hobject_t soid;
     ObjectRecoveryProgress recovery_progress;
@@ -216,15 +216,15 @@ private:
     }
   };
 
-  std::map<hobject_t, PullInfo> pulling;
+  std::map<hobject_t, pull_info_t> pulling;
 
   // Reverse mapping from osd peer to objects being pulled from that peer
   std::map<pg_shard_t, std::set<hobject_t> > pull_from_peer;
   void clear_pull(
-    std::map<hobject_t, PullInfo>::iterator piter,
+    std::map<hobject_t, pull_info_t>::iterator piter,
     bool clear_pull_from_peer = true);
   void clear_pull_from(
-    std::map<hobject_t, PullInfo>::iterator piter);
+    std::map<hobject_t, pull_info_t>::iterator piter);
 
   void _do_push(OpRequestRef op);
   void _do_pull_response(OpRequestRef op);