fixup: crimson/osd: compile and link with ECTransaction.cc

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/osd/ECListener.h b/src/osd/ECListener.h
index 229d268e77b05ba59bbd145ad37474818bbe4773..765c1411015e35a9367489b110a05a833abcc591 100644 (file)
--- a/src/osd/ECListener.h
+++ b/src/osd/ECListener.h
@@ -15,7 +15,9 @@
 
 #pragma once
 
+#ifndef WITH_CRIMSON
 #include "osd_internal_types.h"
+#endif
 #include "OSDMap.h"
 #include "common/WorkQueue.h"
 #include "PGLog.h"

diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
index db2e8d94466398f893475747ba22794b68ae1fec..bd8c991c43c64dc37f9073d2479dc17ea4b2018b 100644 (file)
--- a/src/osd/ECTransaction.cc
+++ b/src/osd/ECTransaction.cc
@@ -23,7 +23,7 @@
 #include "os/ObjectStore.h"
 #include "common/inline_variant.h"
 
-#ifndef WITH_SEASTAR
+#ifndef WITH_CRIMSON
 #include "osd/osd_internal_types.h"
 #else
 #include "crimson/osd/object_context.h"

diff --git a/src/osd/PGTransaction.h b/src/osd/PGTransaction.h
index afc9ab714fc1029cdaff0fe42e9c9122973bb481..55ad9add48f641662c2924ef83c417418f182ca4 100644 (file)
--- a/src/osd/PGTransaction.h
+++ b/src/osd/PGTransaction.h
@@ -25,7 +25,7 @@
 #include "osd/osd_internal_types.h"
 #else
 #include "crimson/osd/object_context.h"
-using ObjectContextRef = crimson::osd::ObjectContextRef;
+typedef crimson::osd::ObjectContextRef ObjectContextRef;
 #endif
 #include "common/interval_map.h"
 #include "common/inline_variant.h"