osd: pass by value

CID 717054: Big parameter passed by value (PASS_BY_VALUE)
At (1): Passing parameter recovery_info of type ObjectRecoveryInfo (size 640 bytes) by value.

and more

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 55e44fa1fc6708d1df016d593ff103db82e058bb..684b120d769be76b32561970f7b6f29493416580 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4955,7 +4955,7 @@ void ReplicatedPG::push_start(
 }
 
 int ReplicatedPG::send_pull(int peer,
-                           ObjectRecoveryInfo recovery_info,
+                           const ObjectRecoveryInfo& recovery_info,
                            ObjectRecoveryProgress progress)
 {
   // send op
@@ -5075,7 +5075,7 @@ void ReplicatedPG::submit_push_complete(ObjectRecoveryInfo &recovery_info,
   write_info(*t);
 }
 
-ObjectRecoveryInfo ReplicatedPG::recalc_subsets(ObjectRecoveryInfo recovery_info)
+ObjectRecoveryInfo ReplicatedPG::recalc_subsets(const ObjectRecoveryInfo& recovery_info)
 {
   if (!recovery_info.soid.snap || recovery_info.soid.snap >= CEPH_NOSNAP)
     return recovery_info;
@@ -5273,7 +5273,7 @@ void ReplicatedPG::handle_push(OpRequestRef op)
 }
 
 int ReplicatedPG::send_push(int peer,
-                           ObjectRecoveryInfo recovery_info,
+                           const ObjectRecoveryInfo& recovery_info,
                            ObjectRecoveryProgress progress,
                            ObjectRecoveryProgress *out_progress)
 {

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index d8c2d2408e4d8cb7066a4e31d0d6f945140b06df..7302e0bd6f5bbb53d3042daea6b615d465dfabd9 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -616,7 +616,7 @@ protected:
   };
   map<hobject_t, PullInfo> pulling;
 
-  ObjectRecoveryInfo recalc_subsets(ObjectRecoveryInfo recovery_info);
+  ObjectRecoveryInfo recalc_subsets(const ObjectRecoveryInfo& recovery_info);
   static void trim_pushed_data(const interval_set<uint64_t> &copy_subset,
                               const interval_set<uint64_t> &intervals_received,
                               bufferlist data_received,
@@ -625,11 +625,11 @@ protected:
   void handle_pull_response(OpRequestRef op);
   void handle_push(OpRequestRef op);
   int send_push(int peer,
-               ObjectRecoveryInfo recovery_info,
+               const ObjectRecoveryInfo& recovery_info,
                ObjectRecoveryProgress progress,
                ObjectRecoveryProgress *out_progress = 0);
   int send_pull(int peer,
-               ObjectRecoveryInfo recovery_info,
+               const ObjectRecoveryInfo& recovery_info,
                ObjectRecoveryProgress progress);
   void submit_push_data(const ObjectRecoveryInfo &recovery_info,
                        bool first,