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:13 -0400 |
commit | a3530df33eb91d787d08c7383a0a9982690e42d0 (patch) | |
tree | 3022fc82ea661654bfca48fae32a7a1584dba1e8 /net/ceph/messenger.c | |
parent | a255651d4cad89f1a606edd36135af892ada4f20 (diff) |
ceph: have get_authorizer methods return pointers
Have the get_authorizer auth_client method return a ceph_auth
pointer rather than an integer, pointer-encoding any returned
error value. This is to pave the way for making use of the
returned value in an upcoming patch.
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index e0532d5b22f5..ac27a2c0694a 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -658,7 +658,7 @@ static int prepare_connect_authorizer(struct ceph_connection *con) | |||
658 | void *auth_buf; | 658 | void *auth_buf; |
659 | int auth_len; | 659 | int auth_len; |
660 | int auth_protocol; | 660 | int auth_protocol; |
661 | int ret; | 661 | struct ceph_auth_handshake *auth; |
662 | 662 | ||
663 | if (!con->ops->get_authorizer) { | 663 | if (!con->ops->get_authorizer) { |
664 | con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN; | 664 | con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN; |
@@ -674,13 +674,13 @@ static int prepare_connect_authorizer(struct ceph_connection *con) | |||
674 | auth_buf = NULL; | 674 | auth_buf = NULL; |
675 | auth_len = 0; | 675 | auth_len = 0; |
676 | auth_protocol = CEPH_AUTH_UNKNOWN; | 676 | auth_protocol = CEPH_AUTH_UNKNOWN; |
677 | ret = con->ops->get_authorizer(con, &auth_buf, &auth_len, | 677 | auth = con->ops->get_authorizer(con, &auth_buf, &auth_len, |
678 | &auth_protocol, &con->auth_reply_buf, | 678 | &auth_protocol, &con->auth_reply_buf, |
679 | &con->auth_reply_buf_len, con->auth_retry); | 679 | &con->auth_reply_buf_len, con->auth_retry); |
680 | mutex_lock(&con->mutex); | 680 | mutex_lock(&con->mutex); |
681 | 681 | ||
682 | if (ret) | 682 | if (IS_ERR(auth)) |
683 | return ret; | 683 | return PTR_ERR(auth); |
684 | 684 | ||
685 | if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) | 685 | if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state)) |
686 | return -EAGAIN; | 686 | return -EAGAIN; |