Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f43fb53 authored by Alex Elder's avatar Alex Elder Committed by Alex Elder
Browse files

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: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent a3530df3

fs/ceph/mds_client.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -3401,9 +3401,7 @@ out: 
 * managed separately.  Caller must *not* attempt to free it.

 * managed separately.  Caller must *not* attempt to free it.

 */

 */

static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,

static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,

					void **buf, int *len, int *proto,

					int *proto, int force_new)

					void **reply_buf, int *reply_len,

					int force_new)

{

{

	struct ceph_mds_session *s = con->private;

	struct ceph_mds_session *s = con->private;

	struct ceph_mds_client *mdsc = s->s_mdsc;

	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)

		if (ret)

			return ERR_PTR(ret);

			return ERR_PTR(ret);

	}

	}



	*proto = ac->protocol;

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

	return auth;

}

}

include/linux/ceph/messenger.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -27,9 +27,7 @@ struct ceph_connection_operations { 
	/* authorize an outgoing connection */

	/* authorize an outgoing connection */

	struct ceph_auth_handshake *(*get_authorizer) (

	struct ceph_auth_handshake *(*get_authorizer) (

				struct ceph_connection *con,

				struct ceph_connection *con,

				void **buf, int *len, int *proto,

			       int *proto, int force_new);

				void **reply_buf, int *reply_len,

				int force_new);

	int (*verify_authorizer_reply) (struct ceph_connection *con, int len);

	int (*verify_authorizer_reply) (struct ceph_connection *con, int len);

	int (*invalidate_authorizer)(struct ceph_connection *con);

	int (*invalidate_authorizer)(struct ceph_connection *con);

net/ceph/messenger.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -671,20 +671,21 @@ static int prepare_connect_authorizer(struct ceph_connection *con) 




	mutex_unlock(&con->mutex);

	mutex_unlock(&con->mutex);





	auth_buf = NULL;

	auth_len = 0;

	auth_protocol = CEPH_AUTH_UNKNOWN;

	auth_protocol = CEPH_AUTH_UNKNOWN;

	auth = con->ops->get_authorizer(con, &auth_buf, &auth_len,

	auth = con->ops->get_authorizer(con, &auth_protocol, con->auth_retry);

				&auth_protocol, &con->auth_reply_buf,



				&con->auth_reply_buf_len, con->auth_retry);

	mutex_lock(&con->mutex);

	mutex_lock(&con->mutex);





	if (IS_ERR(auth))

	if (IS_ERR(auth))

		return PTR_ERR(auth);

		return PTR_ERR(auth);



	if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))

	if (test_bit(CLOSED, &con->state) || test_bit(OPENING, &con->state))

		return -EAGAIN;

		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_protocol = cpu_to_le32(auth_protocol);

	con->out_connect.authorizer_len = cpu_to_le32(auth_len);

	con->out_connect.authorizer_len = cpu_to_le32(auth_len);

net/ceph/osd_client.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -2113,9 +2113,7 @@ static void put_osd_con(struct ceph_connection *con) 
 * managed separately.  Caller must *not* attempt to free it.

 * managed separately.  Caller must *not* attempt to free it.

 */

 */

static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,

static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,

					void **buf, int *len, int *proto,

					int *proto, int force_new)

					void **reply_buf, int *reply_len,

					int force_new)

{

{

	struct ceph_osd *o = con->private;

	struct ceph_osd *o = con->private;

	struct ceph_osd_client *osdc = o->o_osdc;

	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)

		if (ret)

			return ERR_PTR(ret);

			return ERR_PTR(ret);

	}

	}



	*proto = ac->protocol;

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

	return auth;

}

}