ceph: remove unused erank field

The ceph_entity_addr erank field is obsolete; remove it.  Get rid of
trivial addr comparison helpers while we're at it.

Signed-off-by: Sage Weil <sage@newdream.net>

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c
index bb94006fc686..223e8bc207e3 100644
--- a/fs/ceph/mon_client.c
+++ b/fs/ceph/mon_client.c
@@ -88,7 +88,7 @@ int ceph_monmap_contains(struct ceph_monmap *m, struct ceph_entity_addr *addr)
         int i;
 
         for (i = 0; i < m->num_mon; i++)
-                if (ceph_entity_addr_equal(addr, &m->mon_inst[i].addr))
+                if (memcmp(addr, &m->mon_inst[i].addr, sizeof(*addr)) == 0)
                         return 1;
         return 0;
 }
@@ -503,7 +503,6 @@ static int build_initial_monmap(struct ceph_mon_client *monc)
                 return -ENOMEM;
         for (i = 0; i < num_mon; i++) {
                 monc->monmap->mon_inst[i].addr = mon_addr[i];
-                monc->monmap->mon_inst[i].addr.erank = 0;
                 monc->monmap->mon_inst[i].addr.nonce = 0;
                 monc->monmap->mon_inst[i].name.type =
                         CEPH_ENTITY_TYPE_MON;