From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 26 Mar 2025 08:12:39 +0000 (+0000)
Subject: rgw: fix the version in DOCODE_START() of RGWZoneGroupPlacementTier
X-Git-Tag: v20.3.0~257^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F62515%2Fhead;p=ceph.git

rgw: fix the version in DOCODE_START() of RGWZoneGroupPlacementTier

This commit fixes an undetected merge conflict between PRs #61745
and #60159. The dencoding problem has been introduced very recently,
it is straightforward and causes failures of the make check bot
everywhere, therefore -- if no objections -- I want to merge this
patch without the Teuthology testing.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/rgw/rgw_zone_types.h b/src/rgw/rgw_zone_types.h
index c2695be65c7b..d3cd73c9aa05 100644
--- a/src/rgw/rgw_zone_types.h
+++ b/src/rgw/rgw_zone_types.h
@@ -626,7 +626,7 @@ struct RGWZoneGroupPlacementTier {
   }
 
   void decode(bufferlist::const_iterator& bl) {
-    DECODE_START(3, bl);
+    DECODE_START(4, bl);
     decode(tier_type, bl);
     decode(storage_class, bl);
     decode(retain_head_object, bl);