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

libceph: rename ceph_entity_name_encode() -> ceph_auth_entity_name_encode() 

Clear up EntityName vs entity_name_t confusion.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Alex Elder <elder@linaro.org>
steinar/wifi_calib_4_9_kernel
Ilya Dryomov 2016-06-02 16:45:08 +02:00
parent 694d0d0bb2
commit f01d5cb24e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/ceph/auth.h
View File

@ -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, extern int ceph_handle_auth_reply(struct ceph_auth_client *ac,
void *buf, size_t len, void *buf, size_t len,
void *reply_buf, size_t reply_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, extern int ceph_build_auth(struct ceph_auth_client *ac,
void *msg_buf, size_t msg_len); void *msg_buf, size_t msg_len);

7
net/ceph/auth.c
View File

@ -82,7 +82,10 @@ void ceph_auth_reset(struct ceph_auth_client *ac)
mutex_unlock(&ac->mutex); 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); 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++) for (i = 0; i < num; i++)
ceph_encode_32(&p, supported_protocols[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) if (ret < 0)
goto out; goto out;
ceph_decode_need(&p, end, sizeof(u64), bad); ceph_decode_need(&p, end, sizeof(u64), bad);

2
net/ceph/auth_none.c
View File

@ -46,7 +46,7 @@ static int ceph_auth_none_build_authorizer(struct ceph_auth_client *ac,
int ret; int ret;
ceph_encode_8_safe(&p, end, 1, e_range); 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) if (ret < 0)
return ret; return ret;