crimson/os/seastore: cleanup final base_ertr users

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

diff --git a/src/crimson/os/seastore/async_cleaner.h b/src/crimson/os/seastore/async_cleaner.h
index 5cb7a9e13bb0ad4d11fb456332ad64f6bf6b43ba..458efed23aa9a08724fc927c9f4f6a710dc77201 100644 (file)
--- a/src/crimson/os/seastore/async_cleaner.h
+++ b/src/crimson/os/seastore/async_cleaner.h
@@ -1178,8 +1178,6 @@ using RBMSpaceTrackerRef = std::unique_ptr<RBMSpaceTracker>;
 class AsyncCleaner {
 public:
   using state_t = BackgroundListener::state_t;
-  using base_ertr = crimson::errorator<
-    crimson::ct_error::input_output_error>;
 
   virtual void set_background_callback(BackgroundListener *) = 0;
 

diff --git a/src/crimson/os/seastore/btree/btree_types.cc b/src/crimson/os/seastore/btree/btree_types.cc
index 1da13bf622c28c3b51e17490e0ec3e735c291430..75c479f0ed8b495b2e684e7764c114f9a23028b7 100644 (file)
--- a/src/crimson/os/seastore/btree/btree_types.cc
+++ b/src/crimson/os/seastore/btree/btree_types.cc
@@ -8,7 +8,7 @@
 
 namespace crimson::os::seastore {
 
-LBACursor::base_iertr::future<> LBACursor::refresh()
+base_iertr::future<> LBACursor::refresh()
 {
   LOG_PREFIX(LBACursor::refresh);
   return with_btree<lba::LBABtree>(

diff --git a/src/crimson/os/seastore/btree/btree_types.h b/src/crimson/os/seastore/btree/btree_types.h
index 3f919eed69965fd079adb48dbe4cab415b882606..c07bac4ef74eb1ae929c613b68fff7dcf319d8e5 100644 (file)
--- a/src/crimson/os/seastore/btree/btree_types.h
+++ b/src/crimson/os/seastore/btree/btree_types.h
@@ -285,9 +285,6 @@ struct LBACursor : BtreeCursor<laddr_t, lba::lba_map_val_t> {
     return val->refcount;
   }
 
-  using base_ertr = crimson::errorator<
-    crimson::ct_error::input_output_error>;
-  using base_iertr = trans_iertr<base_ertr>;
   base_iertr::future<> refresh();
 };
 using LBACursorRef = boost::intrusive_ptr<LBACursor>;

diff --git a/src/crimson/os/seastore/extent_placement_manager.h b/src/crimson/os/seastore/extent_placement_manager.h
index e2999ddb3140802818c541fa1ef3afb5db47d291..95378d558e62bc5b5566177785774356345f0286 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.h
+++ b/src/crimson/os/seastore/extent_placement_manager.h
@@ -28,8 +28,6 @@ class Cache;
  * Different writers write extents to different locations.
  */
 class ExtentOolWriter {
-  using base_ertr = crimson::errorator<
-      crimson::ct_error::input_output_error>;
 public:
   virtual ~ExtentOolWriter() {}
 

diff --git a/src/crimson/os/seastore/journal/record_submitter.h b/src/crimson/os/seastore/journal/record_submitter.h
index 656022ee09ca785ef7bc915ecad95739746cd24d..a9fbbb48bb93a71f965b528c6abb134ea6c78e67 100644 (file)
--- a/src/crimson/os/seastore/journal/record_submitter.h
+++ b/src/crimson/os/seastore/journal/record_submitter.h
@@ -23,8 +23,6 @@ namespace crimson::os::seastore::journal {
 
 class JournalAllocator {
 public:
-  using base_ertr = crimson::errorator<
-      crimson::ct_error::input_output_error>;
   virtual const std::string& get_name() const = 0;
   
   virtual void update_modify_time(record_t& record) = 0;
@@ -238,9 +236,6 @@ class RecordSubmitter {
     // OVERFLOW: outstanding_io >  io_depth_limit is impossible
   };
 
-  using base_ertr = crimson::errorator<
-      crimson::ct_error::input_output_error>;
-
 public:
   RecordSubmitter(std::size_t io_depth,
                   std::size_t batch_capacity,

diff --git a/src/crimson/os/seastore/lba_mapping.cc b/src/crimson/os/seastore/lba_mapping.cc
index 53b52b39e9249445f5ad49435706e24553c2b9c9..1613ff4fc5f4dc1e1889f27d1a947602f95b27e4 100644 (file)
--- a/src/crimson/os/seastore/lba_mapping.cc
+++ b/src/crimson/os/seastore/lba_mapping.cc
@@ -80,7 +80,7 @@ bool LBAMapping::is_data_stable() const {
     direct_cursor->key);
 }
 
-LBAMapping::next_iertr::future<LBAMapping> LBAMapping::next()
+base_iertr::future<LBAMapping> LBAMapping::next()
 {
   LOG_PREFIX(LBAMapping::next);
   auto ctx = get_effective_cursor().ctx;
@@ -104,10 +104,10 @@ LBAMapping::next_iertr::future<LBAMapping> LBAMapping::next()
   });
 }
 
-LBAMapping::refresh_iertr::future<LBAMapping> LBAMapping::refresh()
+base_iertr::future<LBAMapping> LBAMapping::refresh()
 {
   if (is_viewable()) {
-    return refresh_iertr::make_ready_future<LBAMapping>(*this);
+    return base_iertr::make_ready_future<LBAMapping>(*this);
   }
   return seastar::do_with(
     direct_cursor,
@@ -117,12 +117,12 @@ LBAMapping::refresh_iertr::future<LBAMapping> LBAMapping::refresh()
       if (direct_cursor) {
        return direct_cursor->refresh();
       }
-      return refresh_iertr::now();
+      return base_iertr::now();
     }).si_then([&indirect_cursor] {
       if (indirect_cursor) {
        return indirect_cursor->refresh();
       }
-      return refresh_iertr::now();
+      return base_iertr::now();
     }).si_then([&direct_cursor, &indirect_cursor] {
       return LBAMapping(direct_cursor, indirect_cursor);
     });

diff --git a/src/crimson/os/seastore/lba_mapping.h b/src/crimson/os/seastore/lba_mapping.h
index a2be0319126db90154830485b2e7efb37cdba678..5abe0db7db806aba39aa4039f90fae4cf70fc555 100644 (file)
--- a/src/crimson/os/seastore/lba_mapping.h
+++ b/src/crimson/os/seastore/lba_mapping.h
@@ -163,15 +163,13 @@ public:
 
   LogicalChildNodeRef peek_logical_extent(Transaction &t) const;
 
-  using refresh_iertr = LBACursor::base_iertr;
   //TODO: should be changed to return future<> once all calls
   //     to refresh are through co_await. We return LBAMapping
   //     for now to avoid mandating the callers to make sure
   //     the life of the lba mapping survives the refresh.
-  refresh_iertr::future<LBAMapping> refresh();
+  base_iertr::future<LBAMapping> refresh();
 
-  using next_iertr = LBACursor::base_iertr;
-  next_iertr::future<LBAMapping> next();
+  base_iertr::future<LBAMapping> next();
 
 private:
   friend lba::BtreeLBAManager;