xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: messenger: reduce args to create_authorizer

Browse Source 
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>
This commit is contained in:
Alex Elder
2012-05-16 15:16:39 -05:00
committed by Alex Elder
parent 6c4a19158b
commit 74f1869f76
5 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/ceph/osd_client.c
View File

@@ -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 (force_new && auth->authorizer) {
ac->ops->destroy_authorizer(ac, auth->authorizer);
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 (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;
}