hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/ceph/mds_client.c
View File

@ -3402,31 +3402,28 @@ static int get_authorizer(struct ceph_connection *con,
struct ceph_mds_session *s = con->private;
struct ceph_mds_client *mdsc = s->s_mdsc;
struct ceph_auth_client *ac = mdsc->fsc->client->monc.auth;
struct ceph_auth_handshake *auth = &s->s_auth;
int ret = 0;
if (force_new && s->s_auth.authorizer) {
ac->ops->destroy_authorizer(ac, s->s_auth.authorizer);
s->s_auth.authorizer = NULL;
if (force_new && auth->authorizer) {
ac->ops->destroy_authorizer(ac, auth->authorizer);
auth->authorizer = NULL;
}
if (s->s_auth.authorizer == NULL) {
if (auth->authorizer == NULL) {
if (ac->ops->create_authorizer) {
ret = ac->ops->create_authorizer(
ac, CEPH_ENTITY_TYPE_MDS,
&s->s_auth.authorizer,
&s->s_auth.authorizer_buf,
&s->s_auth.authorizer_buf_len,
&s->s_auth.authorizer_reply_buf,
&s->s_auth.authorizer_reply_buf_len);
ret = ac->ops->create_authorizer(ac,
CEPH_ENTITY_TYPE_MDS, auth);
if (ret)
return ret;
}
}
*proto = ac->protocol;
*buf = s->s_auth.authorizer_buf;
*len = s->s_auth.authorizer_buf_len;
*reply_buf = s->s_auth.authorizer_reply_buf;
*reply_len = s->s_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;
}

4
include/linux/ceph/auth.h
View File

@ -51,9 +51,7 @@ struct ceph_auth_client_ops {
* the response to authenticate the service.
*/
int (*create_authorizer)(struct ceph_auth_client *ac, int peer_type,
struct ceph_authorizer **a,
void **buf, size_t *len,
void **reply_buf, size_t *reply_len);
struct ceph_auth_handshake *auth);
int (*verify_authorizer_reply)(struct ceph_auth_client *ac,
struct ceph_authorizer *a, size_t len);
void (*destroy_authorizer)(struct ceph_auth_client *ac,

15
net/ceph/auth_none.c
View File

@ -59,9 +59,7 @@ static int handle_reply(struct ceph_auth_client *ac, int result,
*/
static int ceph_auth_none_create_authorizer(
struct ceph_auth_client *ac, int peer_type,
struct ceph_authorizer **a,
void **buf, size_t *len,
void **reply_buf, size_t *reply_len)
struct ceph_auth_handshake *auth)
{
struct ceph_auth_none_info *ai = ac->private;
struct ceph_none_authorizer *au = &ai->au;
@ -82,11 +80,12 @@ static int ceph_auth_none_create_authorizer(
dout("built authorizer len %d\n", au->buf_len);
}
*a = (struct ceph_authorizer *)au;
*buf = au->buf;
*len = au->buf_len;
*reply_buf = au->reply_buf;
*reply_len = sizeof(au->reply_buf);
auth->authorizer = (struct ceph_authorizer *) au;
auth->authorizer_buf = au->buf;
auth->authorizer_buf_len = au->buf_len;
auth->authorizer_reply_buf = au->reply_buf;
auth->authorizer_reply_buf_len = sizeof (au->reply_buf);
return 0;
bad2:

15
net/ceph/auth_x.c
View File

@ -526,9 +526,7 @@ static int ceph_x_handle_reply(struct ceph_auth_client *ac, int result,
static int ceph_x_create_authorizer(
struct ceph_auth_client *ac, int peer_type,
struct ceph_authorizer **a,
void **buf, size_t *len,
void **reply_buf, size_t *reply_len)
struct ceph_auth_handshake *auth)
{
struct ceph_x_authorizer *au;
struct ceph_x_ticket_handler *th;
@ -548,11 +546,12 @@ static int ceph_x_create_authorizer(
return ret;
}
*a = (struct ceph_authorizer *)au;
*buf = au->buf->vec.iov_base;
*len = au->buf->vec.iov_len;
*reply_buf = au->reply_buf;
*reply_len = sizeof(au->reply_buf);
auth->authorizer = (struct ceph_authorizer *) au;
auth->authorizer_buf = au->buf->vec.iov_base;
auth->authorizer_buf_len = au->buf->vec.iov_len;
auth->authorizer_reply_buf = au->reply_buf;
auth->authorizer_reply_buf_len = sizeof (au->reply_buf);
return 0;
}

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;
}