osd: pass shared_ptr by const reference

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 55046ffe6ceaa059775fb9958945079af20a646a..b9f2f6157578f175163ae239d1795abf7169b518 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -1171,7 +1171,7 @@ struct FinishReadOp : public GenContext<ThreadPool::TPHandle&>  {
 };
 
 void ECBackend::filter_read_op(
-  const OSDMapRef osdmap,
+  const OSDMapRef& osdmap,
   ReadOp &op)
 {
   set<hobject_t, hobject_t::BitwiseComparator> to_cancel;
@@ -1232,7 +1232,7 @@ void ECBackend::filter_read_op(
   }
 }
 
-void ECBackend::check_recovery_sources(const OSDMapRef osdmap)
+void ECBackend::check_recovery_sources(const OSDMapRef& osdmap)
 {
   set<ceph_tid_t> tids_to_filter;
   for (map<pg_shard_t, set<ceph_tid_t> >::iterator 

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index 91aa7fd8fa74d722f7320c5225f9c0e87b0d7a39..ac937feab9a287df035386bd696ebefc526c6965 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -80,7 +80,7 @@ public:
     );
 
   /// @see ReadOp below
-  void check_recovery_sources(const OSDMapRef osdmap);
+  void check_recovery_sources(const OSDMapRef& osdmap);
 
   void on_change();
   void clear_recovery_state();
@@ -313,7 +313,7 @@ public:
   };
   friend struct FinishReadOp;
   void filter_read_op(
-    const OSDMapRef osdmap,
+    const OSDMapRef& osdmap,
     ReadOp &op);
   void complete_read_op(ReadOp &rop, RecoveryMessages *m);
   friend ostream &operator<<(ostream &lhs, const ReadOp &rhs);

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 1cf85d225866d52d9e5e8ac2c9c4418c30d5d021..8880cf54e3318562b7007d9fe706b65f6794f8e7 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -420,7 +420,7 @@ public:
       );
 
     /// Uses osdmap to update structures for now down sources
-    void check_recovery_sources(const OSDMapRef osdmap);
+    void check_recovery_sources(const OSDMapRef& osdmap);
 
     /// Call when hoid is no longer missing in acting set
     void recovered(const hobject_t &hoid) {
@@ -1120,7 +1120,7 @@ public:
   void cancel_recovery();
   void clear_recovery_state();
   virtual void _clear_recovery_state() = 0;
-  virtual void check_recovery_sources(const OSDMapRef newmap) = 0;
+  virtual void check_recovery_sources(const OSDMapRef& newmap) = 0;
   void start_recovery_op(const hobject_t& soid);
   void finish_recovery_op(const hobject_t& soid, bool dequeue=false);
 

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index a082476afbf5d9689018317581fa245d86536500..e749102f8bfb9c9a6795847928421b7b17c8b70f 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -319,7 +319,7 @@ typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
      OpRequestRef op ///< [in] message received
      ) = 0; ///< @return true if the message was handled
 
-   virtual void check_recovery_sources(const OSDMapRef osdmap) = 0;
+   virtual void check_recovery_sources(const OSDMapRef& osdmap) = 0;
 
 
    /**

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 333a66cc550eb5105081948cdf5424a959446fcf..a090c2de5bde26ac7548312cfe8fd4dc72b865c4 100644 (file)
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -155,7 +155,7 @@ void ReplicatedBackend::recover_object(
   }
 }
 
-void ReplicatedBackend::check_recovery_sources(const OSDMapRef osdmap)
+void ReplicatedBackend::check_recovery_sources(const OSDMapRef& osdmap)
 {
   for(map<pg_shard_t, set<hobject_t, hobject_t::BitwiseComparator> >::iterator i = pull_from_peer.begin();
       i != pull_from_peer.end();

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index a562635c0cdff3fba6938c85caa24f3a7ff73c8b..f7da28d60dbd663b2a6a756750ef6123555f6cf5 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -58,7 +58,7 @@ public:
     RecoveryHandle *h
     );
 
-  void check_recovery_sources(const OSDMapRef osdmap);
+  void check_recovery_sources(const OSDMapRef& osdmap);
 
   /// @see PGBackend::delay_message_until_active
   bool can_handle_while_inactive(OpRequestRef op);

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index cd8d91f598c5719b0cb59f78d5b77c2ac0602c1e..68f9b930e6e34645a6ba7a4bc470945d59e08d01 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10433,7 +10433,7 @@ void ReplicatedPG::cancel_pull(const hobject_t &soid)
   finish_degraded_object(soid);
 }
 
-void ReplicatedPG::check_recovery_sources(const OSDMapRef osdmap)
+void ReplicatedPG::check_recovery_sources(const OSDMapRef& osdmap)
 {
   /*
    * check that any peers we are planning to (or currently) pulling
@@ -10465,7 +10465,7 @@ void ReplicatedPG::check_recovery_sources(const OSDMapRef osdmap)
   }
 }
 
-void PG::MissingLoc::check_recovery_sources(const OSDMapRef osdmap)
+void PG::MissingLoc::check_recovery_sources(const OSDMapRef& osdmap)
 {
   set<pg_shard_t> now_down;
   for (set<pg_shard_t>::iterator p = missing_loc_sources.begin();

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 66bc96827aa18a5d930b28a0a4d78cbaac0695ee..c65da4cb8a5bcd653a336a573f9f39d40c1ad860 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -1093,7 +1093,7 @@ protected:
   void finish_degraded_object(const hobject_t& oid);
 
   // Cancels/resets pulls from peer
-  void check_recovery_sources(const OSDMapRef map);
+  void check_recovery_sources(const OSDMapRef& map);
 
   int recover_missing(
     const hobject_t& oid,