From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Sep 2018 19:29:59 +0000 (-0500)
Subject: msg/simple: remove get_authorizer wrapper
X-Git-Tag: v14.0.1~26^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=955017ea4d0bb16cc11a3ea1e09e2bfd280b3b87;p=ceph.git

msg/simple: remove get_authorizer wrapper

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

diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 0b59bdcfaf7c4..f0465e25f7693 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -1148,7 +1148,7 @@ int Pipe::connect()
 
   while (1) {
     if (!authorizer) {
-      authorizer = msgr->get_authorizer(peer_type, false);
+      authorizer = msgr->ms_deliver_get_authorizer(peer_type, false);
     }
     bufferlist authorizer_reply;
 
@@ -1265,7 +1265,7 @@ int Pipe::connect()
       got_bad_auth = true;
       pipe_lock.Unlock();
       delete authorizer;
-      authorizer = msgr->get_authorizer(peer_type, true);  // try harder
+      authorizer = msgr->ms_deliver_get_authorizer(peer_type, true);
       continue;
     }
     if (reply.tag == CEPH_MSGR_TAG_RESETSESSION) {
diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc
index 26e05a8f60a0f..6c33295f0cf18 100644
--- a/src/msg/simple/SimpleMessenger.cc
+++ b/src/msg/simple/SimpleMessenger.cc
@@ -425,11 +425,6 @@ Pipe *SimpleMessenger::connect_rank(const entity_addr_t& addr,
 
 
 
-AuthAuthorizer *SimpleMessenger::get_authorizer(int peer_type, bool force_new)
-{
-  return ms_deliver_get_authorizer(peer_type, force_new);
-}
-
 bool SimpleMessenger::verify_authorizer(Connection *con, int peer_type,
 					int protocol, bufferlist& authorizer, bufferlist& authorizer_reply,
 					bool& isvalid,CryptoKey& session_key,
diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index d899ba31d2c7a..b0322711e08b9 100644
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -351,10 +351,6 @@ public:
    * @{
    */
 
-  /**
-   * This wraps ms_deliver_get_authorizer. We use it for Pipe.
-   */
-  AuthAuthorizer *get_authorizer(int peer_type, bool force_new);
   /**
    * This wraps ms_deliver_verify_authorizer; we use it for Pipe.
    */