ceph: messenger: reduce args to create_authorizer

Make use of the new ceph_auth_handshake structure in order to reduce
the number of arguments passed to the create_authorizor method in
ceph_auth_client_ops.  Use a local variable of that type as a
shorthand in the get_authorizer method definitions.

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

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 42013c62048838dbfeda14288c335e60d8322f6a..b71ffd2c80942f71bb338df0580129d4c7ea8a39 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3402,31 +3402,28 @@ static int get_authorizer(struct ceph_connection *con,
        struct ceph_mds_session *s = con->private;
        struct ceph_mds_client *mdsc = s->s_mdsc;
        struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;
+       struct ceph_auth_handshake *auth = &s->s_auth;
        int ret = 0;
 
-       if (force_new && s->s_auth.authorizer) {
-               ac->ops->destroy_authorizer(ac, s->s_auth.authorizer);
-               s->s_auth.authorizer = NULL;
+       if (force_new && auth->authorizer) {
+               ac->ops->destroy_authorizer(ac, auth->authorizer);
+               auth->authorizer = NULL;
        }
-       if (s->s_auth.authorizer == NULL) {
+       if (auth->authorizer == NULL) {
                if (ac->ops->create_authorizer) {
-                       ret = ac->ops->create_authorizer(
-                               ac, CEPH_ENTITY_TYPE_MDS,
-                               &s->s_auth.authorizer,
-                               &s->s_auth.authorizer_buf,
-                               &s->s_auth.authorizer_buf_len,
-                               &s->s_auth.authorizer_reply_buf,
-                               &s->s_auth.authorizer_reply_buf_len);
+                       ret = ac->ops->create_authorizer(ac,
+                                               CEPH_ENTITY_TYPE_MDS, auth);
                        if (ret)
                                return ret;
                }
        }
 
        *proto = ac->protocol;
-       *buf = s->s_auth.authorizer_buf;
-       *len = s->s_auth.authorizer_buf_len;
-       *reply_buf = s->s_auth.authorizer_reply_buf;
-       *reply_len = s->s_auth.authorizer_reply_buf_len;
+       *buf = auth->authorizer_buf;
+       *len = auth->authorizer_buf_len;
+       *reply_buf = auth->authorizer_reply_buf;
+       *reply_len = auth->authorizer_reply_buf_len;
+
        return 0;
 }
 

diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index 5b774d141e0969d56560b175c39c689ccc0b0a80..d4080f309b5699d5fbaa5dbe96d38a1977be7693 100644 (file)
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -51,9 +51,7 @@ struct ceph_auth_client_ops {
         * the response to authenticate the service.
         */
        int (*create_authorizer)(struct ceph_auth_client *ac, int peer_type,
-                                struct ceph_authorizer **a,
-                                void **buf, size_t *len,
-                                void **reply_buf, size_t *reply_len);
+                                struct ceph_auth_handshake *auth);
        int (*verify_authorizer_reply)(struct ceph_auth_client *ac,
                                       struct ceph_authorizer *a, size_t len);
        void (*destroy_authorizer)(struct ceph_auth_client *ac,

diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c
index 214c2bb43d6252056a7a77dcd2d8eb5877c719d1..925ca583c09c8eae2fbaebbd73603e9194132f97 100644 (file)
--- a/net/ceph/auth_none.c
+++ b/net/ceph/auth_none.c
@@ -59,9 +59,7 @@ static int handle_reply(struct ceph_auth_client *ac, int result,
  */
 static int ceph_auth_none_create_authorizer(
        struct ceph_auth_client *ac, int peer_type,
-       struct ceph_authorizer **a,
-       void **buf, size_t *len,
-       void **reply_buf, size_t *reply_len)
+       struct ceph_auth_handshake *auth)
 {
        struct ceph_auth_none_info *ai = ac->private;
        struct ceph_none_authorizer *au = &ai->au;
@@ -82,11 +80,12 @@ static int ceph_auth_none_create_authorizer(
                dout("built authorizer len %d\n", au->buf_len);
        }
 
-       *a = (struct ceph_authorizer *)au;
-       *buf = au->buf;
-       *len = au->buf_len;
-       *reply_buf = au->reply_buf;
-       *reply_len = sizeof(au->reply_buf);
+       auth->authorizer = (struct ceph_authorizer *) au;
+       auth->authorizer_buf = au->buf;
+       auth->authorizer_buf_len = au->buf_len;
+       auth->authorizer_reply_buf = au->reply_buf;
+       auth->authorizer_reply_buf_len = sizeof (au->reply_buf);
+
        return 0;
 
 bad2:

diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
index 1587dc6010c6276fd7c6e997bb7af6fe08d426be..a16bf14eb027cd4e765320f98b0fb378b5a5e7c4 100644 (file)
--- a/net/ceph/auth_x.c
+++ b/net/ceph/auth_x.c
@@ -526,9 +526,7 @@ static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result,
 
 static int ceph_x_create_authorizer(
        struct ceph_auth_client *ac, int peer_type,
-       struct ceph_authorizer **a,
-       void **buf, size_t *len,
-       void **reply_buf, size_t *reply_len)
+       struct ceph_auth_handshake *auth)
 {
        struct ceph_x_authorizer *au;
        struct ceph_x_ticket_handler *th;
@@ -548,11 +546,12 @@ static int ceph_x_create_authorizer(
                return ret;
        }
 
-       *a = (struct ceph_authorizer *)au;
-       *buf = au->buf->vec.iov_base;
-       *len = au->buf->vec.iov_len;
-       *reply_buf = au->reply_buf;
-       *reply_len = sizeof(au->reply_buf);
+       auth->authorizer = (struct ceph_authorizer *) au;
+       auth->authorizer_buf = au->buf->vec.iov_base;
+       auth->authorizer_buf_len = au->buf->vec.iov_len;
+       auth->authorizer_reply_buf = au->reply_buf;
+       auth->authorizer_reply_buf_len = sizeof (au->reply_buf);
+
        return 0;
 }
 

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 66b09d6a1531ae98a224a77a6013223e28b24d54..2da4b9e97dc165b03deb7be1928e2df800157290 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2115,29 +2115,25 @@ static int get_authorizer(struct ceph_connection *con,
        struct ceph_osd *o = con->private;
        struct ceph_osd_client *osdc = o->o_osdc;
        struct ceph_auth_client *ac = osdc->client->monc.auth;
+       struct ceph_auth_handshake *auth = &o->o_auth;
        int ret = 0;
 
-       if (force_new && o->o_auth.authorizer) {
-               ac->ops->destroy_authorizer(ac, o->o_auth.authorizer);
-               o->o_auth.authorizer = NULL;
-       }
-       if (o->o_auth.authorizer == NULL) {
-               ret = ac->ops->create_authorizer(
-                       ac, CEPH_ENTITY_TYPE_OSD,
-                       &o->o_auth.authorizer,
-                       &o->o_auth.authorizer_buf,
-                       &o->o_auth.authorizer_buf_len,
-                       &o->o_auth.authorizer_reply_buf,
-                       &o->o_auth.authorizer_reply_buf_len);
+       if (force_new && auth->authorizer) {
+               ac->ops->destroy_authorizer(ac, auth->authorizer);
+               auth->authorizer = NULL;
+       }
+       if (auth->authorizer == NULL) {
+               ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_OSD, auth);
                if (ret)
                        return ret;
        }
 
        *proto = ac->protocol;
-       *buf = o->o_auth.authorizer_buf;
-       *len = o->o_auth.authorizer_buf_len;
-       *reply_buf = o->o_auth.authorizer_reply_buf;
-       *reply_len = o->o_auth.authorizer_reply_buf_len;
+       *buf = auth->authorizer_buf;
+       *len = auth->authorizer_buf_len;
+       *reply_buf = auth->authorizer_reply_buf;
+       *reply_len = auth->authorizer_reply_buf_len;
+
        return 0;
 }