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

Commit a3530df3 authored by Alex Elder's avatar Alex Elder Committed by Alex Elder
Browse files

ceph: have get_authorizer methods return pointers 



Have the get_authorizer auth_client method return a ceph_auth
pointer rather than an integer, pointer-encoding any returned
error value.  This is to pave the way for making use of the
returned value in an upcoming patch.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent a255651d

fs/ceph/mds_client.c

+13 −7
Original line number Diff line number Diff line
@@ -3395,15 +3395,20 @@ out: 
/*

 * authentication

 */

static int get_authorizer(struct ceph_connection *con,



/*

 * Note: returned pointer is the address of a structure that's

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

					void **reply_buf, int *reply_len,

					int force_new)

{

	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 && auth->authorizer) {

		if (ac->ops && ac->ops->destroy_authorizer)
@@ -3411,9 +3416,10 @@ static int get_authorizer(struct ceph_connection *con, 
		auth->authorizer = NULL;

	}

	if (!auth->authorizer && ac->ops && ac->ops->create_authorizer) {

		ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_MDS, auth);

		int ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

							auth);

		if (ret)

			return ret;

			return ERR_PTR(ret);

	}



	*proto = ac->protocol;
@@ -3422,7 +3428,7 @@ static int get_authorizer(struct ceph_connection *con, 
	*reply_buf = auth->authorizer_reply_buf;

	*reply_len = auth->authorizer_reply_buf_len;



	return 0;

	return auth;

}

include/linux/ceph/messenger.h

+5 −3
Original line number Diff line number Diff line
@@ -25,9 +25,11 @@ struct ceph_connection_operations { 
	void (*dispatch) (struct ceph_connection *con, struct ceph_msg *m);



	/* authorize an outgoing connection */

	int (*get_authorizer) (struct ceph_connection *con,

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

				void **reply_buf, int *reply_len,

				int force_new);

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

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

net/ceph/messenger.c

+4 −4
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static int prepare_connect_authorizer(struct ceph_connection *con) 
	void *auth_buf;

	int auth_len;

	int auth_protocol;

	int ret;

	struct ceph_auth_handshake *auth;



	if (!con->ops->get_authorizer) {

		con->out_connect.authorizer_protocol = CEPH_AUTH_UNKNOWN;
@@ -674,13 +674,13 @@ static int prepare_connect_authorizer(struct ceph_connection *con) 
	auth_buf = NULL;

	auth_len = 0;

	auth_protocol = CEPH_AUTH_UNKNOWN;

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

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

				&auth_protocol, &con->auth_reply_buf,

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

	mutex_lock(&con->mutex);



	if (ret)

		return ret;

	if (IS_ERR(auth))

		return PTR_ERR(auth);



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

		return -EAGAIN;

net/ceph/osd_client.c

+12 −7
Original line number Diff line number Diff line
@@ -2108,15 +2108,19 @@ static void put_osd_con(struct ceph_connection *con) 
/*

 * authentication

 */

static int get_authorizer(struct ceph_connection *con,

/*

 * Note: returned pointer is the address of a structure that's

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

					void **reply_buf, int *reply_len,

					int force_new)

{

	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 && auth->authorizer) {

		if (ac->ops && ac->ops->destroy_authorizer)
@@ -2124,9 +2128,10 @@ static int get_authorizer(struct ceph_connection *con, 
		auth->authorizer = NULL;

	}

	if (!auth->authorizer && ac->ops && ac->ops->create_authorizer) {

		ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_OSD, auth);

		int ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_OSD,

							auth);

		if (ret)

			return ret;

			return ERR_PTR(ret);

	}



	*proto = ac->protocol;
@@ -2135,7 +2140,7 @@ static int get_authorizer(struct ceph_connection *con, 
	*reply_buf = auth->authorizer_reply_buf;

	*reply_len = auth->authorizer_reply_buf_len;



	return 0;

	return auth;

}