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

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

libceph: rename ceph_entity_name_encode() -> ceph_auth_entity_name_encode() 



Clear up EntityName vs entity_name_t confusion.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent 694d0d0b

include/linux/ceph/auth.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ extern int ceph_auth_build_hello(struct ceph_auth_client *ac, 
extern int ceph_handle_auth_reply(struct ceph_auth_client *ac,

				  void *buf, size_t len,

				  void *reply_buf, size_t reply_len);

extern int ceph_entity_name_encode(const char *name, void **p, void *end);

int ceph_auth_entity_name_encode(const char *name, void **p, void *end);



extern int ceph_build_auth(struct ceph_auth_client *ac,

		    void *msg_buf, size_t msg_len);

net/ceph/auth.c

+5 −2
Original line number Diff line number Diff line
@@ -82,7 +82,10 @@ void ceph_auth_reset(struct ceph_auth_client *ac) 
	mutex_unlock(&ac->mutex);

}



int ceph_entity_name_encode(const char *name, void **p, void *end)

/*

 * EntityName, not to be confused with entity_name_t

 */

int ceph_auth_entity_name_encode(const char *name, void **p, void *end)

{

	int len = strlen(name);
@@ -124,7 +127,7 @@ int ceph_auth_build_hello(struct ceph_auth_client *ac, void *buf, size_t len) 
	for (i = 0; i < num; i++)

		ceph_encode_32(&p, supported_protocols[i]);



	ret = ceph_entity_name_encode(ac->name, &p, end);

	ret = ceph_auth_entity_name_encode(ac->name, &p, end);

	if (ret < 0)

		goto out;

	ceph_decode_need(&p, end, sizeof(u64), bad);

net/ceph/auth_none.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int ceph_auth_none_build_authorizer(struct ceph_auth_client *ac, 
	int ret;



	ceph_encode_8_safe(&p, end, 1, e_range);

	ret = ceph_entity_name_encode(ac->name, &p, end);

	ret = ceph_auth_entity_name_encode(ac->name, &p, end);

	if (ret < 0)

		return ret;