diff options
| author | Sage Weil <sage@newdream.net> | 2010-03-01 23:50:05 +0100 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-03-02 00:28:00 +0100 |
| commit | e53a8fd773065628b24605b289a9a40ee4a35d83 (patch) | |
| tree | 7e590c04181eb8d4c9f8cc0e038853acc870f3f3 | |
| parent | ceph: return EBADF if waiting for caps on closed file (diff) | |
| download | linux-e53a8fd773065628b24605b289a9a40ee4a35d83.tar.xz linux-e53a8fd773065628b24605b289a9a40ee4a35d83.zip | |
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>
| -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) ceph_decode_copy(p, &pi->v, sizeof(pi->v)); __insert_pg_pool(&map->pg_pools, pi); calc_pg_masks(pi); - p += le32_to_cpu(pi->v.num_snaps) * sizeof(u64); - p += le32_to_cpu(pi->v.num_removed_snap_intervals) + *p += le32_to_cpu(pi->v.num_snaps) * sizeof(u64); + *p += le32_to_cpu(pi->v.num_removed_snap_intervals) * sizeof(u64) * 2; } ceph_decode_32_safe(p, end, map->pool_max, bad); |