osd: make {PG,EC}Transaction.h consumable for crimson

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

diff --git a/src/osd/ECTransaction.h b/src/osd/ECTransaction.h
index 56f6e341b5255d06f18a42da088e225e0100a9e8..2aa2941f8db5a66bf075cccf9043e1d295acd2a8 100644 (file)
--- a/src/osd/ECTransaction.h
+++ b/src/osd/ECTransaction.h
@@ -15,12 +15,11 @@
 #ifndef ECTRANSACTION_H
 #define ECTRANSACTION_H
 
-#include "OSD.h"
-#include "PGBackend.h"
 #include "ECUtil.h"
+#include "ExtentCache.h"
 #include "erasure-code/ErasureCodeInterface.h"
+#include "os/Transaction.h"
 #include "PGTransaction.h"
-#include "ExtentCache.h"
 
 namespace ECTransaction {
   struct WritePlan {
@@ -186,7 +185,7 @@ namespace ECTransaction {
     const std::map<hobject_t,extent_map> &partial_extents,
     std::vector<pg_log_entry_t> &entries,
     std::map<hobject_t,extent_map> *written,
-    std::map<shard_id_t, ObjectStore::Transaction> *transactions,
+    std::map<shard_id_t, ceph::os::Transaction> *transactions,
     std::set<hobject_t> *temp_added,
     std::set<hobject_t> *temp_removed,
     DoutPrefixProvider *dpp,

diff --git a/src/osd/PGTransaction.h b/src/osd/PGTransaction.h
index e6f57c90fa1ea62eef8049403c9357177f583ded..bb6e4efc3f47ff69bc5a44c54b4d0182942c5c97 100644 (file)
--- a/src/osd/PGTransaction.h
+++ b/src/osd/PGTransaction.h
@@ -19,8 +19,11 @@
 #include <optional>
 
 #include "common/hobject.h"
-#include "osd/osd_types.h"
+#ifndef WITH_SEASTAR
 #include "osd/osd_internal_types.h"
+#else
+#include "crimson/osd/object_context.h"
+#endif
 #include "common/interval_map.h"
 #include "common/inline_variant.h"