From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Mar 2010 22:50:05 +0000 (-0800)
Subject: ceph: fix osdmap decoding when pools include (removed) snaps
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e53a8fd773065628b24605b289a9a40ee4a35d83;p=deliverable%2Flinux.git

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>
---

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);