diff --git a/[refs] b/[refs] index 4333413fd0fc..c9704243a47f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae32be31341a5fecfa16c5b3eb78095207182cce +refs/heads/master: cebc5be6b6c82a99231e9c9af451e9e3d3399ec6 diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c index ddc656fb5c05..50ce64ebd330 100644 --- a/trunk/fs/ceph/osdmap.c +++ b/trunk/fs/ceph/osdmap.c @@ -707,6 +707,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, newcrush = crush_decode(*p, min(*p+len, end)); if (IS_ERR(newcrush)) return ERR_CAST(newcrush); + *p += len; } /* new flags? */