From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 16 Sep 2019 18:03:49 +0000 (+0800)
Subject: osd/PeeringState: pass MessageRef instead of raw Message pointer
X-Git-Tag: v15.1.0~1471^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd34e8fca349bfca0ce40a348099080b7538f0e8;p=ceph.git

osd/PeeringState: pass MessageRef instead of raw Message pointer

more foolproof this way.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index fac4109c122..349d5b1d47e 100644
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -70,8 +70,8 @@ struct BufferedRecoveryMessages {
     }
   }
 
-  void send_osd_message(int target, Message *m) {
-    message_map[target].push_back(m);
+  void send_osd_message(int target, MessageRef m) {
+    message_map[target].push_back(std::move(m));
   }
   void send_notify(int to, const pg_notify_t &n);
   void send_query(int to, spg_t spgid, const pg_query_t &q);
@@ -214,8 +214,8 @@ struct PeeringCtxWrapper {
 
   PeeringCtxWrapper(PeeringCtxWrapper &&ctx) = default;
 
-  void send_osd_message(int target, Message *m) {
-    msgs.send_osd_message(target, m);
+  void send_osd_message(int target, MessageRef m) {
+    msgs.send_osd_message(target, std::move(m));
   }
   void send_notify(int to, const pg_notify_t &n) {
     msgs.send_notify(to, n);