Commit ce287162 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph, ceph: make use of __ceph_auth_get_authorizer() in msgr1 



This shouldn't cause any functional changes.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent cd1a677c

fs/ceph/mds_client.c

+5 −16
Original line number Diff line number Diff line
@@ -5141,23 +5141,12 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, 
	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;



	if (force_new && auth->authorizer) {

		ceph_auth_destroy_authorizer(auth->authorizer);

		auth->authorizer = NULL;

	}

	if (!auth->authorizer) {

		int ret = ceph_auth_create_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

						      auth);

		if (ret)

			return ERR_PTR(ret);

	} else {

		int ret = ceph_auth_update_authorizer(ac, CEPH_ENTITY_TYPE_MDS,

						      auth);

	ret = __ceph_auth_get_authorizer(ac, auth, CEPH_ENTITY_TYPE_MDS,

					 force_new, proto, NULL, NULL);

	if (ret)

		return ERR_PTR(ret);

	}

	*proto = ac->protocol;



	return auth;

}

net/ceph/osd_client.c

+5 −16
Original line number Diff line number Diff line
@@ -5589,23 +5589,12 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, 
	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;



	if (force_new && auth->authorizer) {

		ceph_auth_destroy_authorizer(auth->authorizer);

		auth->authorizer = NULL;

	}

	if (!auth->authorizer) {

		int ret = ceph_auth_create_authorizer(ac, CEPH_ENTITY_TYPE_OSD,

						      auth);

		if (ret)

			return ERR_PTR(ret);

	} else {

		int ret = ceph_auth_update_authorizer(ac, CEPH_ENTITY_TYPE_OSD,

						     auth);

	ret = __ceph_auth_get_authorizer(ac, auth, CEPH_ENTITY_TYPE_OSD,

					 force_new, proto, NULL, NULL);

	if (ret)

		return ERR_PTR(ret);

	}

	*proto = ac->protocol;



	return auth;

}