crimson/os/seastore/circular_journal_space: cleanup, write_ertr vs submit_ertr

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/os/seastore/journal/circular_journal_space.cc b/src/crimson/os/seastore/journal/circular_journal_space.cc
index cf6bbd8a49904ad9189c5ad284b8a7e1e8ec32c9..a26b5a652d5e64c6f758ccd5dd1c9a3939a3a604 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_journal_space.cc
+++ b/src/crimson/os/seastore/journal/circular_journal_space.cc
@@ -84,7 +84,7 @@ CircularJournalSpace::write(ceph::bufferlist&& to_write) {
           target, get_records_used_size(), length);
     return write_result;
   }).handle_error(
-    base_ertr::pass_further{},
+    write_ertr::pass_further{},
     crimson::ct_error::assert_all{ "Invalid error" }
   );
 }
@@ -167,7 +167,8 @@ ceph::bufferlist CircularJournalSpace::encode_header()
   return bl;
 }
 
-CircularJournalSpace::write_ertr::future<> CircularJournalSpace::device_write_bl(
+CircularJournalSpace::submit_ertr::future<>
+CircularJournalSpace::device_write_bl(
     rbm_abs_addr offset, bufferlist &bl)
 {
   LOG_PREFIX(CircularJournalSpace::device_write_bl);
@@ -181,7 +182,7 @@ CircularJournalSpace::write_ertr::future<> CircularJournalSpace::device_write_bl
     length);
   return device->writev(offset, bl
   ).handle_error(
-    write_ertr::pass_further{},
+    submit_ertr::pass_further{},
     crimson::ct_error::assert_all{ "Invalid error device->write" }
   );
 }
@@ -229,7 +230,7 @@ CircularJournalSpace::read_header()
   });
 }
 
-CircularJournalSpace::write_ertr::future<>
+CircularJournalSpace::submit_ertr::future<>
 CircularJournalSpace::write_header()
 {
   LOG_PREFIX(CircularJournalSpace::write_header);
@@ -245,7 +246,7 @@ CircularJournalSpace::write_header()
   iter.copy(bl.length(), bp.c_str());
   return device->write(device->get_shard_journal_start(), std::move(bp)
   ).handle_error(
-    write_ertr::pass_further{},
+    submit_ertr::pass_further{},
     crimson::ct_error::assert_all{ "Invalid error device->write" }
   );
 }

diff --git a/src/crimson/os/seastore/journal/circular_journal_space.h b/src/crimson/os/seastore/journal/circular_journal_space.h
index ae18656b061628689d7e8284fb7cf565255f8006..2e1cb7ae8df63c521b50b72389c68a0c522b4cde 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_journal_space.h
+++ b/src/crimson/os/seastore/journal/circular_journal_space.h
@@ -69,7 +69,7 @@ class CircularJournalSpace : public JournalAllocator {
   CircularJournalSpace(RBMDevice * device);
 
   struct cbj_header_t;
-  using write_ertr = Journal::submit_record_ertr;
+  using submit_ertr = Journal::submit_record_ertr;
   /*
    * device_write_bl
    *
@@ -77,7 +77,8 @@ class CircularJournalSpace : public JournalAllocator {
    * @param bufferlist to write
    *
    */
-  write_ertr::future<> device_write_bl(rbm_abs_addr offset, ceph::bufferlist &bl);
+  submit_ertr::future<>
+  device_write_bl(rbm_abs_addr offset, ceph::bufferlist &bl);
 
   using read_ertr = crimson::errorator<
     crimson::ct_error::input_output_error,
@@ -100,7 +101,7 @@ class CircularJournalSpace : public JournalAllocator {
 
   ceph::bufferlist encode_header();
 
-  write_ertr::future<> write_header();
+  submit_ertr::future<> write_header();
 
 
   /**