diff --git a/[refs] b/[refs] index fe1945f31a3a..0f0f21a3bb57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30dc6381bbac213987be6fe0b0fb89868ff1f2c0 +refs/heads/master: 7067f797b8409f1e10ec95ac2c1e17a200173d13 diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c index a9416308de6f..0dbd606e21c4 100644 --- a/trunk/fs/ceph/osdmap.c +++ b/trunk/fs/ceph/osdmap.c @@ -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)