| Message ID | 1395944299-21970-12-git-send-email-ilya.dryomov@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/27/2014 01:17 PM, Ilya Dryomov wrote: > Only version 6 of osdmap encoding is supported, anything other than > version 6 results in an error and halts the decoding process. Checking > if version is >= 5 is therefore bogus. Looks good. Reviewed-by: Alex Elder <elder@linaro.org> > Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> > --- > net/ceph/osdmap.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c > index 0fc29a930c06..75e192e99173 100644 > --- a/net/ceph/osdmap.c > +++ b/net/ceph/osdmap.c > @@ -946,11 +946,10 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, > if (err < 0) > goto bad; > } > - if (version >= 5) { > - err = __decode_pool_names(p, end, map); > - if (err) > - goto bad; > - } > + > + err = __decode_pool_names(p, end, map); > + if (err) > + goto bad; > > /* old_pool */ > ceph_decode_32_safe(p, end, len, e_inval); > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 0fc29a930c06..75e192e99173 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -946,11 +946,10 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, if (err < 0) goto bad; } - if (version >= 5) { - err = __decode_pool_names(p, end, map); - if (err) - goto bad; - } + + err = __decode_pool_names(p, end, map); + if (err) + goto bad; /* old_pool */ ceph_decode_32_safe(p, end, len, e_inval);
Only version 6 of osdmap encoding is supported, anything other than version 6 results in an error and halts the decoding process. Checking if version is >= 5 is therefore bogus. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> --- net/ceph/osdmap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)