diff options
author | Alex Elder <elder@inktank.com> | 2012-05-16 16:16:39 -0400 |
---|---|---|
committer | Alex Elder <elder@dreamhost.com> | 2012-05-17 09:18:12 -0400 |
commit | 74f1869f76d043bad12ec03b4d5f04a8c3d1f157 (patch) | |
tree | fcce410d255e2660fc82532c70de1b2f60a956c6 /net/ceph/auth_x.c | |
parent | 6c4a19158b96ea1fb8acbe0c1d5493d9dcd2f147 (diff) |
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>
Diffstat (limited to 'net/ceph/auth_x.c')
-rw-r--r-- | net/ceph/auth_x.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c index 1587dc6010c6..a16bf14eb027 100644 --- 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, | |||
526 | 526 | ||
527 | static int ceph_x_create_authorizer( | 527 | static int ceph_x_create_authorizer( |
528 | struct ceph_auth_client *ac, int peer_type, | 528 | struct ceph_auth_client *ac, int peer_type, |
529 | struct ceph_authorizer **a, | 529 | struct ceph_auth_handshake *auth) |
530 | void **buf, size_t *len, | ||
531 | void **reply_buf, size_t *reply_len) | ||
532 | { | 530 | { |
533 | struct ceph_x_authorizer *au; | 531 | struct ceph_x_authorizer *au; |
534 | struct ceph_x_ticket_handler *th; | 532 | struct ceph_x_ticket_handler *th; |
@@ -548,11 +546,12 @@ static int ceph_x_create_authorizer( | |||
548 | return ret; | 546 | return ret; |
549 | } | 547 | } |
550 | 548 | ||
551 | *a = (struct ceph_authorizer *)au; | 549 | auth->authorizer = (struct ceph_authorizer *) au; |
552 | *buf = au->buf->vec.iov_base; | 550 | auth->authorizer_buf = au->buf->vec.iov_base; |
553 | *len = au->buf->vec.iov_len; | 551 | auth->authorizer_buf_len = au->buf->vec.iov_len; |
554 | *reply_buf = au->reply_buf; | 552 | auth->authorizer_reply_buf = au->reply_buf; |
555 | *reply_len = sizeof(au->reply_buf); | 553 | auth->authorizer_reply_buf_len = sizeof (au->reply_buf); |
554 | |||
556 | return 0; | 555 | return 0; |
557 | } | 556 | } |
558 | 557 | ||