From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 8 Mar 2019 01:06:31 +0000 (+0100)
Subject: msg/async, v2: ::_banner_exchange() takes CtRef instead of CtPtr.
X-Git-Tag: v14.2.0~23^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17591d029b8fefb7d405d6e61f2cdbe2c6eb7aba;p=ceph.git

msg/async, v2: ::_banner_exchange() takes CtRef instead of CtPtr.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index ed79e9085ae..3748755bf84 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -749,9 +749,9 @@ CtPtr ProtocolV2::write(const std::string &desc,
   return nullptr;
 }
 
-CtPtr ProtocolV2::_banner_exchange(CtPtr callback) {
+CtPtr ProtocolV2::_banner_exchange(CtRef callback) {
   ldout(cct, 20) << __func__ << dendl;
-  bannerExchangeCallback = callback;
+  bannerExchangeCallback = &callback;
 
   bufferlist banner_payload;
   encode((uint64_t)CEPH_MSGR2_SUPPORTED_FEATURES, banner_payload, 0);
@@ -1646,7 +1646,7 @@ CtPtr ProtocolV2::start_client_banner_exchange() {
 
   global_seq = messenger->get_global_seq();
 
-  return _banner_exchange(&CONTINUATION(post_client_banner_exchange));
+  return _banner_exchange(CONTINUATION(post_client_banner_exchange));
 }
 
 CtPtr ProtocolV2::post_client_banner_exchange() {
@@ -2089,7 +2089,7 @@ CtPtr ProtocolV2::start_server_banner_exchange() {
 
   state = BANNER_ACCEPTING;
 
-  return _banner_exchange(&CONTINUATION(post_server_banner_exchange));
+  return _banner_exchange(CONTINUATION(post_server_banner_exchange));
 }
 
 CtPtr ProtocolV2::post_server_banner_exchange() {
diff --git a/src/msg/async/ProtocolV2.h b/src/msg/async/ProtocolV2.h
index 08a16b2cf91..084ffe05253 100644
--- a/src/msg/async/ProtocolV2.h
+++ b/src/msg/async/ProtocolV2.h
@@ -142,7 +142,7 @@ private:
   READ_HANDLER_CONTINUATION_DECL(ProtocolV2, _handle_peer_banner);
   READ_HANDLER_CONTINUATION_DECL(ProtocolV2, _handle_peer_banner_payload);
 
-  Ct<ProtocolV2> *_banner_exchange(Ct<ProtocolV2> *callback);
+  Ct<ProtocolV2> *_banner_exchange(Ct<ProtocolV2> &callback);
   Ct<ProtocolV2> *_wait_for_peer_banner();
   Ct<ProtocolV2> *_handle_peer_banner(char *buffer, int r);
   Ct<ProtocolV2> *_handle_peer_banner_payload(char *buffer, int r);