From 7fcc61d26028eb417a0c224e8c9cd3cc95bc13d9 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 27 Aug 2015 11:24:25 -0700 Subject: [PATCH] osd: Decode use_gmt_hitset with a unique version Signed-off-by: David Zafman (cherry picked from commit 2bc5a48f4c5d3667213be3a7b5a0e0f5ef9daf4f) Conflicts: src/osd/osd_types.cc minor changes to resolve conflicts --- src/osd/osd_types.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 7253160014d30..5f15bcf74354e 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -1239,7 +1239,7 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const return; } - ENCODE_START(17, 5, bl); + ENCODE_START(21, 5, bl); ::encode(type, bl); ::encode(size, bl); ::encode(crush_ruleset, bl); @@ -1289,7 +1289,7 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const void pg_pool_t::decode(bufferlist::iterator& bl) { - DECODE_START_LEGACY_COMPAT_LEN(17, 5, 5, bl); + DECODE_START_LEGACY_COMPAT_LEN(21, 5, 5, bl); ::decode(type, bl); ::decode(size, bl); ::decode(crush_ruleset, bl); @@ -1408,6 +1408,8 @@ void pg_pool_t::decode(bufferlist::iterator& bl) if (struct_v >= 20) { uint32_t dummy; ::decode(dummy, bl); + } + if (struct_v >= 21) { ::decode(use_gmt_hitset, bl); } else { use_gmt_hitset = false; -- 2.39.5