From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 18 Apr 2025 09:03:53 +0000 (+0000)
Subject: fixup: crimson/osd: compile and link with ECTransaction.cc
X-Git-Tag: v21.0.0~3^2~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0212c49d3abb7de98b8c529161f7e8c1e18bcd95;p=ceph.git

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 229d268e77b0..765c1411015e 100644
--- 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 5fe8d83152b3..587af4b6813f 100644
--- 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 1bde9c1c2ec7..898ca6f95737 100644
--- 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"