From a8a5530243a5eb8a4c92787b1cb51f2d1102906a Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Mon, 23 Oct 2023 14:34:26 +0200 Subject: [PATCH] MClientRequest: handle ext_num_retry and ext_num_fwd from ceph_mds_request_head_legacy When a client is too old and uses struct ceph_mds_request_head_legacy we must fill new ext_num_retry and ext_num_fwd fields from an old num_retry and num_fwd. Fixes: https://github.com/ceph/ceph/pull/45669 Fixes: https://tracker.ceph.com/issues/63288 Fixes: commit cbd7e3040208 ("ceph_fs.h: add 32 bits extended num_retry and num_fwd support") Signed-off-by: Alexander Mikhalitsyn (cherry picked from commit 43f32a46aa9095b19525357ba7ca215e842b4f77) --- src/messages/MClientRequest.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index 516fdb5e2d790..396e67f1e0fa7 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -224,6 +224,9 @@ class MClientRequest final : public MMDSOp { copy_from_legacy_head(&head, &old_mds_head); head.version = 0; + head.ext_num_retry = head.num_retry; + head.ext_num_fwd = head.num_fwd; + /* Can't set the btime from legacy struct */ if (head.op == CEPH_MDS_OP_SETATTR) { int localmask = head.args.setattr.mask;