diff options
author | Sage Weil <sage@newdream.net> | 2010-03-01 17:50:05 -0500 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-03-01 18:28:00 -0500 |
commit | e53a8fd773065628b24605b289a9a40ee4a35d83 (patch) | |
tree | 7e590c04181eb8d4c9f8cc0e038853acc870f3f3 /fs | |
parent | 195d3ce2cc9a8ec69827f6369c41b269345b9988 (diff) |
ceph: fix osdmap decoding when pools include (removed) snaps
Add missing pointer dereference (p is a void **).
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/osdmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/osdmap.c b/fs/ceph/osdmap.c index 34b5696c84fd..b83f2692b835 100644 --- a/fs/ceph/osdmap.c +++ b/fs/ceph/osdmap.c | |||
@@ -529,8 +529,8 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end) | |||
529 | ceph_decode_copy(p, &pi->v, sizeof(pi->v)); | 529 | ceph_decode_copy(p, &pi->v, sizeof(pi->v)); |
530 | __insert_pg_pool(&map->pg_pools, pi); | 530 | __insert_pg_pool(&map->pg_pools, pi); |
531 | calc_pg_masks(pi); | 531 | calc_pg_masks(pi); |
532 | p += le32_to_cpu(pi->v.num_snaps) * sizeof(u64); | 532 | *p += le32_to_cpu(pi->v.num_snaps) * sizeof(u64); |
533 | p += le32_to_cpu(pi->v.num_removed_snap_intervals) | 533 | *p += le32_to_cpu(pi->v.num_removed_snap_intervals) |
534 | * sizeof(u64) * 2; | 534 | * sizeof(u64) * 2; |
535 | } | 535 | } |
536 | ceph_decode_32_safe(p, end, map->pool_max, bad); | 536 | ceph_decode_32_safe(p, end, map->pool_max, bad); |