From b7c760227211500ef2aff817a64be01fc74fcd3c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= <rzarzyns@redhat.com>
Date: Fri, 6 Oct 2023 16:41:54 +0200
Subject: [PATCH] crimson/osd: compile and link with ECTransaction.cc
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
---
 src/crimson/osd/CMakeLists.txt | 1 +
 src/osd/ECTransaction.cc       | 9 ++++++++-
 src/osd/ECTransaction.h        | 1 +
 src/osd/PGTransaction.h        | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/crimson/osd/CMakeLists.txt b/src/crimson/osd/CMakeLists.txt
index 021ecbd6f54..58deea7ab51 100644
--- a/src/crimson/osd/CMakeLists.txt
+++ b/src/crimson/osd/CMakeLists.txt
@@ -51,6 +51,7 @@ add_executable(crimson-osd
   ${PROJECT_SOURCE_DIR}/src/osd/ECExtentCache.cc
   ${PROJECT_SOURCE_DIR}/src/osd/ECUtil.cc
   ${PROJECT_SOURCE_DIR}/src/osd/ECUtilL.cc
+  ${PROJECT_SOURCE_DIR}/src/osd/ECTransaction.cc
   ${PROJECT_SOURCE_DIR}/src/osd/osd_op_util.cc
   ${PROJECT_SOURCE_DIR}/src/osd/OSDCap.cc
   ${PROJECT_SOURCE_DIR}/src/osd/PeeringState.cc
diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
index 6ce0f4e5ff2..5fe8d83152b 100644
--- a/src/osd/ECTransaction.cc
+++ b/src/osd/ECTransaction.cc
@@ -14,14 +14,21 @@
  */
 
 #include <iostream>
-#include <vector>
+#include <map>
 #include <sstream>
+#include <vector>
 
 #include "ECTransaction.h"
 #include "ECUtil.h"
 #include "os/ObjectStore.h"
 #include "common/inline_variant.h"
 
+#ifndef WITH_SEASTAR
+#include "osd/osd_internal_types.h"
+#else
+#include "crimson/osd/object_context.h"
+#endif
+
 using std::less;
 using std::make_pair;
 using std::map;
diff --git a/src/osd/ECTransaction.h b/src/osd/ECTransaction.h
index 78526dbecba..9e633fde5ee 100644
--- a/src/osd/ECTransaction.h
+++ b/src/osd/ECTransaction.h
@@ -17,6 +17,7 @@
 
 #include "common/dout.h"
 #include "ECUtil.h"
+#include "common/ceph_releases.h"
 #include "erasure-code/ErasureCodeInterface.h"
 #include "os/Transaction.h"
 #include "OSDMap.h"
diff --git a/src/osd/PGTransaction.h b/src/osd/PGTransaction.h
index a20041f1f08..1bde9c1c2ec 100644
--- a/src/osd/PGTransaction.h
+++ b/src/osd/PGTransaction.h
@@ -25,6 +25,7 @@
 #include "osd/osd_internal_types.h"
 #else
 #include "crimson/osd/object_context.h"
+using ObjectContextRef = crimson::osd::ObjectContextRef;
 #endif
 #include "common/interval_map.h"
 #include "common/inline_variant.h"
-- 
2.47.3