From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 11 Jan 2022 12:48:38 +0000 (+0800)
Subject: crimson/os/seastore: drop duplicated record_group_t::current_dlength
X-Git-Tag: v18.0.0~1563^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d18428f0da44ceb8ca19110adac14f428928bf4;p=ceph.git

crimson/os/seastore: drop duplicated record_group_t::current_dlength

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

diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc
index 211e106b898b..49fe210ed6b1 100644
--- a/src/crimson/os/seastore/journal.cc
+++ b/src/crimson/os/seastore/journal.cc
@@ -439,7 +439,7 @@ Journal::RecordBatch::add_pending(
   assert(state != state_t::SUBMITTING);
   assert(can_batch(record, block_size).value() == new_size);
 
-  auto dlength_offset = pending.current_dlength;
+  auto dlength_offset = pending.size.dlength;
   pending.push_back(
       std::move(record), block_size);
   assert(pending.size == new_size);
diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 3ac349d2bc59..01bfecc6010d 100644
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -1355,7 +1355,6 @@ WRITE_EQ_OPERATORS_3(record_group_size_t, plain_mdlength, dlength, block_size);
 struct record_group_t {
   std::vector<record_t> records;
   record_group_size_t size;
-  extent_len_t current_dlength = 0;
 
   record_group_t() = default;
   record_group_t(
@@ -1372,7 +1371,6 @@ struct record_group_t {
       record_t&& record,
       extent_len_t block_size) {
     size.account(record.size, block_size);
-    current_dlength += record.size.dlength;
     records.push_back(std::move(record));
     assert(size.get_encoded_length() < MAX_SEG_OFF);
   }
@@ -1384,7 +1382,6 @@ struct record_group_t {
   void clear() {
     records.clear();
     size = {};
-    current_dlength = 0;
   }
 };