diff options
| author | Yingxin Cheng <yingxin.cheng@intel.com> | 2022-01-11 20:48:38 +0800 |
|---|---|---|
| committer | Yingxin Cheng <yingxin.cheng@intel.com> | 2022-01-14 23:06:43 +0800 |
| commit | 0d18428f0da44ceb8ca19110adac14f428928bf4 (patch) | |
| tree | d0b0689ba3e4e182b1b3dd3107f95ba3df294d3f /src/crimson | |
| parent | 3165692e4315080718e6aeb399569b495ddfe8c1 (diff) | |
| download | ceph-0d18428f0da44ceb8ca19110adac14f428928bf4.tar.gz | |
crimson/os/seastore: drop duplicated record_group_t::current_dlength
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Diffstat (limited to 'src/crimson')
| -rw-r--r-- | src/crimson/os/seastore/journal.cc | 2 | ||||
| -rw-r--r-- | src/crimson/os/seastore/seastore_types.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc index 211e106b898..49fe210ed6b 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 3ac349d2bc5..01bfecc6010 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; } }; |