From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/messages/MOSDOp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/messages/MOSDOp.h') diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index 97432d118..b5de1936b 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -178,7 +178,7 @@ public: partial_decode_needed(true), final_decode_needed(true), bdata_encode(false) { } - MOSDOp(int inc, long tid, const hobject_t& ho, spg_t& _pgid, + MOSDOp(int inc, ceph_tid_t tid, const hobject_t& ho, spg_t& _pgid, epoch_t _osdmap_epoch, int _flags, uint64_t feat) : MOSDFastDispatchOp(CEPH_MSG_OSD_OP, HEAD_VERSION, COMPAT_VERSION), -- cgit v1.2.3