crimson/os/seastore/cache: remove Cache::base_ertr and iertr

Use the common declarations instead

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index 332a5ebecbab257ed96fd35a4b37c340b2e25e49..3dc6dfc7099c8f0e856a511b80a0aaa99ff61bc7 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -18,6 +18,7 @@
 #include "crimson/os/seastore/seastore_types.h"
 #include "crimson/os/seastore/segment_manager.h"
 #include "crimson/os/seastore/transaction.h"
+#include "crimson/os/seastore/transaction_interruptor.h"
 #include "crimson/os/seastore/linked_tree_node.h"
 #include "crimson/os/seastore/extent_pinboard.h"
 
@@ -104,10 +105,6 @@ class SegmentProvider;
  */
 class Cache : public ExtentTransViewRetriever {
 public:
-  using base_ertr = crimson::errorator<
-    crimson::ct_error::input_output_error>;
-  using base_iertr = trans_iertr<base_ertr>;
-
   Cache(ExtentPlacementManager &epm);
   ~Cache();
 

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc
index 051bc1a92758c83cdaba37efaac5a17fbde79665..fe5d500c08d61ae3364f13c9783c741f3a791f3a 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -713,7 +713,7 @@ static bool is_lba_node(const CachedExtent &e)
   return is_lba_node(e.get_type());
 }
 
-BtreeLBAManager::base_iertr::template future<>
+base_iertr::template future<>
 _init_cached_extent(
   op_context_t c,
   const CachedExtentRef &e,

diff --git a/src/crimson/os/seastore/lba/lba_btree_node.h b/src/crimson/os/seastore/lba/lba_btree_node.h
index b0ca21ae98bd8a9d89ea68be2f3c159ac74d4bf2..911592a6159b39e3500c29937372257dc8767115 100644 (file)
--- a/src/crimson/os/seastore/lba/lba_btree_node.h
+++ b/src/crimson/os/seastore/lba/lba_btree_node.h
@@ -26,7 +26,6 @@ class LogicalChildNode;
 
 namespace crimson::os::seastore::lba {
 
-using base_iertr = Cache::base_iertr;
 using LBANode = FixedKVNode<laddr_t>;
 
 class BtreeLBAMapping;

diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h
index b4cbc44518d901ee876c5aa811f97792d05bef3a..e6567b059040eb8392c12900e437ca567d0bc766 100644 (file)
--- a/src/crimson/os/seastore/lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager.h
@@ -29,8 +29,6 @@ namespace crimson::os::seastore {
  */
 class LBAManager {
 public:
-  using base_iertr = Cache::base_iertr;
-
   using mkfs_iertr = base_iertr;
   using mkfs_ret = mkfs_iertr::future<>;
   virtual mkfs_ret mkfs(