crimson/os/seastore/journal: rename journal_replay_lb to journal_tail

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

diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc
index 88d3e238a877a29088c9810501ddce7032acd2eb..26f894faf1e2094b9e2130d86d9b89da00cd8324 100644 (file)
--- a/src/crimson/os/seastore/journal.cc
+++ b/src/crimson/os/seastore/journal.cc
@@ -211,7 +211,7 @@ Journal::find_replay_segments_fut Journal::find_replay_segments()
                rt.second.journal_segment_seq;
            });
 
-         auto replay_from = segments.rbegin()->second.journal_replay_lb;
+         auto replay_from = segments.rbegin()->second.journal_tail;
          auto from = segments.begin();
          if (replay_from != P_ADDR_NULL) {
            from = std::find_if(

diff --git a/src/crimson/os/seastore/journal.h b/src/crimson/os/seastore/journal.h
index 8f9f92be465d20802fc84cfd452c9c077a4507b6..6556a4a8bebae034449eb9f91e484cb3b6974417 100644 (file)
--- a/src/crimson/os/seastore/journal.h
+++ b/src/crimson/os/seastore/journal.h
@@ -29,21 +29,19 @@ static constexpr journal_seq_t NO_DELTAS =
  * Every segment contains and encode segment_header_t in the first block.
  * Our strategy for finding the journal replay point is:
  * 1) Find the segment with the highest journal_segment_seq
- * 2) Scan forward from committed_journal_lb to find the most recent
- *    journal_commit_lb record
- * 3) Replay starting at the most recent found journal_commit_lb record
+ * 2) Replay starting at record located at that segment's journal_tail
  */
 struct segment_header_t {
   segment_seq_t journal_segment_seq;
   segment_id_t physical_segment_id; // debugging
 
-  paddr_t journal_replay_lb;
+  paddr_t journal_tail;
 
   DENC(segment_header_t, v, p) {
     DENC_START(1, 1, p);
     denc(v.journal_segment_seq, p);
     denc(v.physical_segment_id, p);
-    denc(v.journal_replay_lb, p);
+    denc(v.journal_tail, p);
     DENC_FINISH(p);
   }
 };