ceph: use info returned by get_authorizer

Rather than passing a bunch of arguments to be filled in with the
content of the ceph_auth_handshake buffer now returned by the
get_authorizer method, just use the returned information in the
caller, and drop the unnecessary arguments.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index ac27a2c0694a..6d82c1a1a89b 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -671,20 +671,21 @@ static int prepare_connect_authorizer(struct ceph_connection *con)
 
         mutex_unlock(&con->mutex);
 
-        auth_buf = NULL;
-        auth_len = 0;
         auth_protocol = CEPH_AUTH_UNKNOWN;
-        auth = con->ops->get_authorizer(con, &auth_buf, &auth_len,
-                                &auth_protocol, &con->auth_reply_buf,
-                                &con->auth_reply_buf_len, con->auth_retry);
+        auth = con->ops->get_authorizer(con, &auth_protocol, con->auth_retry);
+
         mutex_lock(&con->mutex);
 
         if (IS_ERR(auth))
                 return PTR_ERR(auth);
-
         if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))
                 return -EAGAIN;
 
+        auth_buf = auth->authorizer_buf;
+        auth_len = auth->authorizer_buf_len;
+        con->auth_reply_buf = auth->authorizer_reply_buf;
+        con->auth_reply_buf_len = auth->authorizer_reply_buf_len;
+
         con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);
         con->out_connect.authorizer_len = cpu_to_le32(auth_len);