crimson/osd: compile and link with ECTransaction.cc

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/CMakeLists.txt b/src/crimson/osd/CMakeLists.txt
index 021ecbd6f544bc84aa3c70e54a94ad8c434c5e1a..58deea7ab51e9ed846ff38a0fad363cb0097f4bb 100644 (file)
--- 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 6ce0f4e5ff2076b6298179223c7c554a21c803a2..5fe8d83152b3d30105ad4033882f9e0a1ea5082a 100644 (file)
--- 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 78526dbecba8af0187f00b73726efcd7dd382f4f..9e633fde5eecfea0ae41395f794fdbbc4d450c77 100644 (file)
--- 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 a20041f1f08bc0bc05ab6b51097671e32244509a..1bde9c1c2ec70c023154ac0b1cf3568dcd5bc2f3 100644 (file)
--- 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"