From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 18 Dec 2020 15:46:49 +0000 (-0500)
Subject: rgw: fix decode of cls_rgw reshard types
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d81ba078bb43c9d9fd1e2ce932ba7626190f154c;p=ceph.git

rgw: fix decode of cls_rgw reshard types

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
index dd3a2a6d6976b..dff29b20da02f 100644
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/src/cls/rgw/cls_rgw_types.h
@@ -1264,7 +1264,7 @@ struct cls_rgw_reshard_entry
     decode(bucket_name, bl);
     decode(bucket_id, bl);
     if (struct_v < 2) {
-      std::string new_instance_id;
+      std::string new_instance_id; // removed in v2
       decode(new_instance_id, bl);
     }
     decode(old_num_shards, bl);