diff options
| author | Ilya Dryomov | 2014-03-13 15:36:16 +0100 |
|---|---|---|
| committer | Sage Weil | 2014-04-05 06:07:46 +0200 |
| commit | 9464d00862ea6a5c0edc7118c86bdfa71a95190e (patch) | |
| tree | 85225fbea983f745e108a5de981e858f6cf4ee86 /net/ceph/osdmap.c | |
| parent | libceph: fixup error handling in osdmap_apply_incremental() (diff) | |
| download | kernel-qcow2-linux-9464d00862ea6a5c0edc7118c86bdfa71a95190e.tar.gz kernel-qcow2-linux-9464d00862ea6a5c0edc7118c86bdfa71a95190e.tar.xz kernel-qcow2-linux-9464d00862ea6a5c0edc7118c86bdfa71a95190e.zip | |
libceph: nuke bogus encoding version check in osdmap_apply_incremental()
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>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net/ceph/osdmap.c')
| -rw-r--r-- | net/ceph/osdmap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index b844a9273666..07fa3697ea12 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -952,11 +952,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); |