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 | 8f43fb53894079bf0caab6e348ceaffe7adc651a (patch) | |
tree | 248ffc7366b569d13049a31e2cb1c88750d45ead /fs | |
parent | a3530df33eb91d787d08c7383a0a9982690e42d0 (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 'fs')
-rw-r--r-- | fs/ceph/mds_client.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 67938a9d049b..200bc87eceb1 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -3401,9 +3401,7 @@ out: | |||
3401 | * managed separately. Caller must *not* attempt to free it. | 3401 | * managed separately. Caller must *not* attempt to free it. |
3402 | */ | 3402 | */ |
3403 | static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, | 3403 | static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, |
3404 | void **buf, int *len, int *proto, | 3404 | int *proto, int force_new) |
3405 | void **reply_buf, int *reply_len, | ||
3406 | int force_new) | ||
3407 | { | 3405 | { |
3408 | struct ceph_mds_session *s = con->private; | 3406 | struct ceph_mds_session *s = con->private; |
3409 | struct ceph_mds_client *mdsc = s->s_mdsc; | 3407 | struct ceph_mds_client *mdsc = s->s_mdsc; |
@@ -3421,12 +3419,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, | |||
3421 | if (ret) | 3419 | if (ret) |
3422 | return ERR_PTR(ret); | 3420 | return ERR_PTR(ret); |
3423 | } | 3421 | } |
3424 | |||
3425 | *proto = ac->protocol; | 3422 | *proto = ac->protocol; |
3426 | *buf = auth->authorizer_buf; | ||
3427 | *len = auth->authorizer_buf_len; | ||
3428 | *reply_buf = auth->authorizer_reply_buf; | ||
3429 | *reply_len = auth->authorizer_reply_buf_len; | ||
3430 | 3423 | ||
3431 | return auth; | 3424 | return auth; |
3432 | } | 3425 | } |