Skip to content

Commit

Permalink
ceph: messenger: reduce args to create_authorizer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Elder authored and Alex Elder committed May 17, 2012
1 parent 6c4a191 commit 74f1869
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 50 deletions.
27 changes: 12 additions & 15 deletions fs/ceph/mds_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 1 addition & 3 deletions include/linux/ceph/auth.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
15 changes: 7 additions & 8 deletions net/ceph/auth_none.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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:
Expand Down
15 changes: 7 additions & 8 deletions net/ceph/auth_x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
28 changes: 12 additions & 16 deletions net/ceph/osd_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 74f1869

Please sign in to comment.