libceph: rename ceph_entity_name_encode() -> ceph_auth_entity_name_encode()

[linux-2.6-microblaze.git] / net / ceph / auth.c

diff --git a/net/ceph/auth.c b/net/ceph/auth.c
index 2bc5965..78067dd 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);