From: Alexander Mikhalitsyn Date: Mon, 23 Oct 2023 12:34:26 +0000 (+0200) Subject: MClientRequest: handle ext_num_retry and ext_num_fwd from ceph_mds_request_head_legacy X-Git-Tag: v17.2.8~551^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e0f3192e17406f0a4d9564008e0796237127c36;p=ceph.git 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) --- diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index 3a192efd8f8..336a0019ffd 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -231,6 +231,9 @@ public: 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;