diff options
| author | Sage Weil <sage@newdream.net> | 2009-11-03 15:17:56 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-11-03 15:17:56 -0800 |
| commit | 63f2d211954b790fea0a9caeae605c7956535af6 (patch) | |
| tree | b49257aa54d9657539eeba014f9ff5f91f8495de /fs/ceph/osdmap.c | |
| parent | 859e7b149362475672e2a996f29b8f45cbb34d82 (diff) | |
| download | op-kernel-dev-63f2d211954b790fea0a9caeae605c7956535af6.zip op-kernel-dev-63f2d211954b790fea0a9caeae605c7956535af6.tar.gz | |
ceph: use fixed endian encoding for ceph_entity_addr
We exchange struct ceph_entity_addr over the wire and store it on disk.
The sockaddr_storage.ss_family field, however, is host endianness. So,
fix ss_family endianness to big endian when sending/receiving over the
wire.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/osdmap.c')
| -rw-r--r-- | fs/ceph/osdmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/osdmap.c b/fs/ceph/osdmap.c index d62e111..cd7bb26 100644 --- a/fs/ceph/osdmap.c +++ b/fs/ceph/osdmap.c @@ -460,6 +460,8 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end) *p += 4; /* skip length field (should match max) */ ceph_decode_copy(p, map->osd_addr, map->max_osd*sizeof(*map->osd_addr)); + for (i = 0; i < map->max_osd; i++) + ceph_decode_addr(&map->osd_addr[i]); /* pg_temp */ ceph_decode_32_safe(p, end, len, bad); @@ -619,6 +621,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, struct ceph_entity_addr addr; ceph_decode_32_safe(p, end, osd, bad); ceph_decode_copy_safe(p, end, &addr, sizeof(addr), bad); + ceph_decode_addr(&addr); pr_info("osd%d up\n", osd); BUG_ON(osd >= map->max_osd); map->osd_state[osd] |= CEPH_OSD_UP; |
