Merge pull request ceph#65962 from NitzanMordhai/wip-nitzan-MOSDOpReply-pgid64-encode-decode-fix

messages: MOSDOpReply encode and decode errorcode32_t with PGID64 fea…

Author: SrinivasaBharath

src/include/types.h

@@ -541,8 +541,8 @@ struct errorcode32_t {
     return hostos_to_ceph_errno(code);
   }
 
-  inline void set_wire_to_host(code_t host_code) {
-    code = ceph_to_hostos_errno(host_code);
+  inline void set_wire_to_host(code_t wire_code) {
+    code = ceph_to_hostos_errno(wire_code);
   }
 
   void encode(ceph::buffer::list &bl) const {

src/messages/MOSDOpReply.h

@@ -187,7 +187,7 @@ class MOSDOpReply final : public Message {
       head.flags = flags;
       head.osdmap_epoch = osdmap_epoch;
       head.reassert_version = bad_replay_version;
-      head.result = result;
+      head.result = result.get_host_to_wire();
       head.num_ops = ops.size();
       head.object_len = oid.name.length();
       encode(head, payload);
@@ -269,8 +269,9 @@ class MOSDOpReply final : public Message {
       }
       ceph::decode_nohead(head.object_len, oid.name, p);
       pgid = pg_t(head.layout.ol_pgid);
-      result = (int32_t)head.result;
+      result.set_wire_to_host((int32_t)head.result);
       flags = head.flags;
+      bad_replay_version = head.reassert_version;
       replay_version = head.reassert_version;
       user_version = replay_version.version;
       osdmap_epoch = head.osdmap_epoch;