Commit 7067f797 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: fix incremental osdmap pg_temp decoding bug 



An incremental pg_temp wasn't being decoded properly (wrong bound on
for loop).

Also remove unused local variable, while we're at it.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 30dc6381

fs/ceph/osdmap.c

+1 −2
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, 
					     struct ceph_osdmap *map,

					     struct ceph_messenger *msgr)

{

	struct ceph_osdmap *newmap = map;

	struct crush_map *newcrush = NULL;

	struct ceph_fsid fsid;

	u32 epoch = 0;
@@ -701,7 +700,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, 
			}

			pg->pgid = pgid;

			pg->len = pglen;

			for (j = 0; j < len; j++)

			for (j = 0; j < pglen; j++)

				pg->osds[j] = ceph_decode_32(p);

			err = __insert_pg_mapping(pg, &map->pg_temp);

			if (err)