diff options
author | Sage Weil <sage@newdream.net> | 2010-01-07 16:12:36 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-01-14 12:23:38 -0800 |
commit | 103e2d3ae57d38d18aaac1b327266c1407499ac1 (patch) | |
tree | 9e46032de5680bd987e8fdd16753856e496812e6 /fs/ceph/osd_client.c | |
parent | 4baa75ef0ed29adae03fcbbaa9aca1511a5a8cc9 (diff) | |
download | blackbird-op-linux-103e2d3ae57d38d18aaac1b327266c1407499ac1.tar.gz blackbird-op-linux-103e2d3ae57d38d18aaac1b327266c1407499ac1.zip |
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>
Diffstat (limited to 'fs/ceph/osd_client.c')
-rw-r--r-- | fs/ceph/osd_client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c index a0aac436d5d4..80b868f7a0fc 100644 --- a/fs/ceph/osd_client.c +++ b/fs/ceph/osd_client.c @@ -821,9 +821,10 @@ static void kick_requests(struct ceph_osd_client *osdc, n = rb_next(p); if (!ceph_osd_is_up(osdc->osdmap, osd->o_osd) || - !ceph_entity_addr_equal(&osd->o_con.peer_addr, - ceph_osd_addr(osdc->osdmap, - osd->o_osd))) + memcmp(&osd->o_con.peer_addr, + ceph_osd_addr(osdc->osdmap, + osd->o_osd), + sizeof(struct ceph_entity_addr)) != 0) reset_osd(osdc, osd); } } |