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>

2 files changed, 8 insertions, 14 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index ac27a2c0694..6d82c1a1a89 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);
 
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index fa74ae0ea91..b7d633cc96a 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2113,9 +2113,7 @@ static void put_osd_con(struct ceph_connection *con)
  * managed separately.  Caller must *not* attempt to free it.
  */
 static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
-                                        void **buf, int *len, int *proto,
-                                        void **reply_buf, int *reply_len,
-                                        int force_new)
+                                        int *proto, int force_new)
 {
         struct ceph_osd *o = con->private;
         struct ceph_osd_client *osdc = o->o_osdc;
@@ -2133,12 +2131,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
                 if (ret)
                         return ERR_PTR(ret);
         }
-
         *proto = ac->protocol;
-        *buf = auth->authorizer_buf;
-        *len = auth->authorizer_buf_len;
-        *reply_buf = auth->authorizer_reply_buf;
-        *reply_len = auth->authorizer_reply_buf_len;
 
         return auth;
 }