msg/async: remove get_authorizer wrapper

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

diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index 8c88e63e115142d221f1204fda6f145d46d41af5..bc6b5cc56a244a3b9503ac265015e2b4b981c9bc 100644 (file)
--- a/src/msg/async/AsyncMessenger.h
+++ b/src/msg/async/AsyncMessenger.h
@@ -378,13 +378,6 @@ public:
     return stack;
   }
 
-  /**
-   * This wraps ms_deliver_get_authorizer. We use it for AsyncConnection.
-   */
-  AuthAuthorizer *get_authorizer(int peer_type, bool force_new) {
-    return ms_deliver_get_authorizer(peer_type, force_new);
-  }
-
   /**
    * This wraps ms_deliver_verify_authorizer; we use it for AsyncConnection.
    */

diff --git a/src/msg/async/Protocol.cc b/src/msg/async/Protocol.cc
index 5b7be2d6ca2b0ebe178006c0def7e0ee6fabcf72..0dcb147b1adf5d82042b5f32e5a369505218e807 100644 (file)
--- a/src/msg/async/Protocol.cc
+++ b/src/msg/async/Protocol.cc
@@ -1410,7 +1410,8 @@ CtPtr ProtocolV1::send_connect_message() {
   ldout(cct, 20) << __func__ << dendl;
 
   if (!authorizer) {
-    authorizer = messenger->get_authorizer(connection->peer_type, false);
+    authorizer = messenger->ms_deliver_get_authorizer(connection->peer_type,
+                                                     false);
   }
 
   ceph_msg_connect connect;
@@ -1561,8 +1562,8 @@ CtPtr ProtocolV1::handle_connect_reply_2() {
     }
     got_bad_auth = true;
     delete authorizer;
-    authorizer =
-        messenger->get_authorizer(connection->peer_type, true);  // try harder
+    authorizer = messenger->ms_deliver_get_authorizer(connection->peer_type,
+                                                     true);  // try harder
     return CONTINUE(send_connect_message);
   }