redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Alex Elder 2012-05-16 15:16:39 -05:00 committed by Alex Elder
parent a3530df33e
commit 8f43fb5389
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ceph/mds_client.c
View File

@ -3401,9 +3401,7 @@ out:
* managed separately. Caller must *not* attempt to free it.
*/
static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
void **buf, int *len, int *proto,
void **reply_buf, int *reply_len,
int force_new)
int *proto, int force_new)
{
struct ceph_mds_session *s = con->private;
struct ceph_mds_client *mdsc = s->s_mdsc;
@ -3421,12 +3419,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
if (ret)
return ERR_PTR(ret);
}
*proto = ac->protocol;
*buf = auth->authorizer_buf;
*len = auth->authorizer_buf_len;
*reply_buf = auth->authorizer_reply_buf;
*reply_len = auth->authorizer_reply_buf_len;
return auth;
}

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

@ -27,9 +27,7 @@ struct ceph_connection_operations {
/* authorize an outgoing connection */
struct ceph_auth_handshake *(*get_authorizer) (
struct ceph_connection *con,
void **buf, int *len, int *proto,
void **reply_buf, int *reply_len,
int force_new);
int *proto, int force_new);
int (*verify_authorizer_reply) (struct ceph_connection *con, int len);
int (*invalidate_authorizer)(struct ceph_connection *con);

13
net/ceph/messenger.c
View File

@ -671,20 +671,21 @@ static int prepare_connect_authorizer(struct ceph_connection *con)
mutex_unlock(&con->mutex);
auth_buf = NULL;
auth_len = 0;
auth_protocol = CEPH_AUTH_UNKNOWN;
auth = con->ops->get_authorizer(con, &auth_buf, &auth_len,
&auth_protocol, &con->auth_reply_buf,
&con->auth_reply_buf_len, con->auth_retry);
auth = con->ops->get_authorizer(con, &auth_protocol, con->auth_retry);
mutex_lock(&con->mutex);
if (IS_ERR(auth))
return PTR_ERR(auth);
if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))
return -EAGAIN;
auth_buf = auth->authorizer_buf;
auth_len = auth->authorizer_buf_len;
con->auth_reply_buf = auth->authorizer_reply_buf;
con->auth_reply_buf_len = auth->authorizer_reply_buf_len;
con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol);
con->out_connect.authorizer_len = cpu_to_le32(auth_len);

9
net/ceph/osd_client.c
View File

@ -2113,9 +2113,7 @@ static void put_osd_con(struct ceph_connection *con)
* managed separately. Caller must *not* attempt to free it.
*/
static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
void **buf, int *len, int *proto,
void **reply_buf, int *reply_len,
int force_new)
int *proto, int force_new)
{
struct ceph_osd *o = con->private;
struct ceph_osd_client *osdc = o->o_osdc;
@ -2133,12 +2131,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
if (ret)
return ERR_PTR(ret);
}
*proto = ac->protocol;
*buf = auth->authorizer_buf;
*len = auth->authorizer_buf_len;
*reply_buf = auth->authorizer_reply_buf;
*reply_len = auth->authorizer_reply_buf_len;
return auth;
}