crimson/.../circular_bounded_journal: inline do_submit_record into submit_record

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
index 88bade79a225cc7608debdb11931c72d59fd7fe0..71302bb560cc885b2edbbf59d5b044763179a055 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
@@ -70,23 +70,7 @@ CircularBoundedJournal::submit_record(
   LOG_PREFIX(CircularBoundedJournal::submit_record);
   DEBUG("H{} {} start ...", (void*)&handle, record);
   assert(write_pipeline);
-  co_await do_submit_record(
-    std::move(record), handle, std::move(on_submission)
-  );
-  if (is_trim_transaction(t_src)) {
-    co_await update_journal_tail(
-      trimmer.get_dirty_tail(),
-      trimmer.get_alloc_tail());
-  }
-}
 
-CircularBoundedJournal::submit_record_ertr::future<>
-CircularBoundedJournal::do_submit_record(
-  record_t &&record,
-  OrderingHandle &handle,
-  on_submission_func_t &&on_submission)
-{
-  LOG_PREFIX(CircularBoundedJournal::do_submit_record);
   stats.submit_record_count++;
   stats.submit_record_size += record.size.get_raw_mdlength();
   auto start = ceph::mono_clock::now();
@@ -146,6 +130,12 @@ CircularBoundedJournal::do_submit_record(
   std::invoke(on_submission, result);
 
   stats.submit_record_latency_total += ceph::mono_clock::now() - start;
+
+  if (is_trim_transaction(t_src)) {
+    co_await update_journal_tail(
+      trimmer.get_dirty_tail(),
+      trimmer.get_alloc_tail());
+  }
 }
 
 Journal::replay_ret CircularBoundedJournal::replay_segment(

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h
index c5ff686a953e9e636321eee7a2c177402e1738b8..59254c583c437c8953117b83618c2e51f43140f4 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.h
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h
@@ -156,11 +156,6 @@ public:
     cbj_delta_handler_t &&delta_handler,
     journal_seq_t tail);
 
-  submit_record_ertr::future<> do_submit_record(
-    record_t &&record,
-    OrderingHandle &handle,
-    on_submission_func_t &&on_submission);
-
   void try_read_rolled_header(scan_valid_records_cursor &cursor) {
     paddr_t addr = convert_abs_addr_to_paddr(
       get_records_start(),