From 31f82c95d6237e4e19fffe993b1eac9ff0eaca1c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 13 Sep 2018 14:32:42 -0500 Subject: [PATCH] msg/async: remove get_authorizer wrapper Signed-off-by: Sage Weil --- src/msg/async/AsyncMessenger.h | 7 ------- src/msg/async/Protocol.cc | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h index 8c88e63e115..bc6b5cc56a2 100644 --- 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 5b7be2d6ca2..0dcb147b1ad 100644 --- 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); } -- 2.39.5