]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/seastore: drop duplicated record_group_t::current_dlength
authorYingxin Cheng <yingxin.cheng@intel.com>
Tue, 11 Jan 2022 12:48:38 +0000 (20:48 +0800)
committerYingxin Cheng <yingxin.cheng@intel.com>
Fri, 14 Jan 2022 15:06:43 +0000 (23:06 +0800)
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
src/crimson/os/seastore/journal.cc
src/crimson/os/seastore/seastore_types.h

index 211e106b898becd72a04df6892f5a1b785a9cfa0..49fe210ed6b112ab96b20d2a4e620be3f6617a7d 100644 (file)
@@ -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);
index 3ac349d2bc594b2d5f53fc25e2222307d44ca01a..01bfecc6010dd2a4faa43c263a4c16abf816905b 100644 (file)
@@ -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;
   }
 };