gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge PR #66269 into tentacle

Browse Source 
* refs/pull/66269/head:
	messages: fix MOSDOpReplay decode of old version bad_replay_version
	include/types: Update set wire function parameter
	messages: MOSDOpReply encode and decode errorcode32_t with PGID64 features on

Reviewed-by: Laura Flores <lflores@redhat.com>
This commit is contained in:
Patrick Donnelly 2026-07-21 15:26:29 -04:00
commit 074f8a6431
No known key found for this signature in database
GPG Key ID: 053758C0A8A3CE2F
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/types.h
View File

@ -635,8 +635,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 {

5
src/messages/MOSDOpReply.h
View File

@ -183,7 +183,7 @@ public:
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);
@ -265,8 +265,9 @@ public:
}
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;