aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-05-16 16:16:39 -0400
committerAlex Elder <elder@dreamhost.com>2012-05-17 09:18:13 -0400
commit8f43fb53894079bf0caab6e348ceaffe7adc651a (patch)
tree248ffc7366b569d13049a31e2cb1c88750d45ead /net/ceph/messenger.c
parenta3530df33eb91d787d08c7383a0a9982690e42d0 (diff)
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>
Diffstat (limited to 'net/ceph/messenger.c')
-rw-r--r--net/ceph/messenger.c13
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)
671 671
672 mutex_unlock(&con->mutex); 672 mutex_unlock(&con->mutex);
673 673
674 auth_buf = NULL;
675 auth_len = 0;
676 auth_protocol = CEPH_AUTH_UNKNOWN; 674 auth_protocol = CEPH_AUTH_UNKNOWN;
677 auth = con->ops->get_authorizer(con, &auth_buf, &auth_len, 675 auth = con->ops->get_authorizer(con, &auth_protocol, con->auth_retry);
678 &auth_protocol, &con->auth_reply_buf, 676
679 &con->auth_reply_buf_len, con->auth_retry);
680 mutex_lock(&con->mutex); 677 mutex_lock(&con->mutex);
681 678
682 if (IS_ERR(auth)) 679 if (IS_ERR(auth))
683 return PTR_ERR(auth); 680 return PTR_ERR(auth);
684
685 if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) 681 if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))
686 return -EAGAIN; 682 return -EAGAIN;
687 683
684 auth_buf = auth->authorizer_buf;
685 auth_len = auth->authorizer_buf_len;
686 con->auth_reply_buf = auth->authorizer_reply_buf;
687 con->auth_reply_buf_len = auth->authorizer_reply_buf_len;
688
688 con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol); 689 con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);
689 con->out_connect.authorizer_len = cpu_to_le32(auth_len); 690 con->out_connect.authorizer_len = cpu_to_le32(auth_len);
690 691