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>

diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index 1563265d209740aadc845d28c1389091c5249728..374bb1c4ef52925a3ce3b55b829587503a0088fa 100644 (file)
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -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);

diff --git a/net/ceph/auth.c b/net/ceph/auth.c
index 2bc5965fdd1ecf464af37b533ed14cb1fafea83c..78067dda9d3cbc25ff15869374e671c9f1692897 100644 (file)
--- a/net/ceph/auth.c
+++ b/net/ceph/auth.c
@@ -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);

diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c
index 5f836f02ae36c1e1356fd0a92b8a676f96fc709f..df45e467c81f2f110e2621bfb977685e95570c8d 100644 (file)
--- a/net/ceph/auth_none.c
+++ b/net/ceph/auth_none.c
@@ -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;