Merge pull request ceph#58399 from cbodley/wip-rgw-deshard-encoding

cbodley · web-flow · commit 9069e1a985e6 · 2024-07-03T15:03:34.000+01:00
cls/rgw: bump cls_rgw_reshard_entry decode version to match encode

Reviewed-by: Adam Emerson &lt;aemerson@redhat.com&gt;
diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
@@ -1369,7 +1369,7 @@ struct cls_rgw_reshard_entry
   }
 
   void decode(ceph::buffer::list::const_iterator& bl) {
-    DECODE_START(2, bl);
+    DECODE_START(3, bl);
     decode(time, bl);
     decode(tenant, bl);
     decode(bucket_name, bl);

Original file line number	Diff line number	Diff line change
`@@ -1369,7 +1369,7 @@ struct cls_rgw_reshard_entry`
`1369`	`1369`	`}`
`1370`	`1370`
`1371`	`1371`	`void decode(ceph::buffer::list::const_iterator& bl) {`
`1372`		`- DECODE_START(2, bl);`
	`1372`	`+ DECODE_START(3, bl);`
`1373`	`1373`	`decode(time, bl);`
`1374`	`1374`	`decode(tenant, bl);`
`1375`	`1375`	`decode(bucket_name, bl);`