Skip to content

Commit 8e38895

Browse files
zhscnMatan-B
authored andcommitted
crimson/os/seastore: fix LBAMapping/BackrefMapping usages
Signed-off-by: Zhang Song <[email protected]> (cherry picked from commit 9c8e0a0)
1 parent 096ddce commit 8e38895

File tree

9 files changed

+307
-345
lines changed

9 files changed

+307
-345
lines changed

src/crimson/os/seastore/async_cleaner.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ double SegmentCleaner::calc_gc_benefit_cost(
10911091
SegmentCleaner::do_reclaim_space_ret
10921092
SegmentCleaner::do_reclaim_space(
10931093
const std::vector<CachedExtentRef> &backref_extents,
1094-
const backref_pin_list_t &pin_list,
1094+
const backref_mapping_list_t &pin_list,
10951095
std::size_t &reclaimed,
10961096
std::size_t &runs)
10971097
{
@@ -1142,10 +1142,10 @@ SegmentCleaner::do_reclaim_space(
11421142
backref_entry_query_set_t backref_entries;
11431143
for (auto &pin : pin_list) {
11441144
backref_entries.emplace(
1145-
pin->get_key(),
1146-
pin->get_val(),
1147-
pin->get_length(),
1148-
pin->get_type());
1145+
pin.get_key(),
1146+
pin.get_val(),
1147+
pin.get_length(),
1148+
pin.get_type());
11491149
}
11501150
for (auto &cached_backref : cached_backref_entries) {
11511151
if (cached_backref.laddr == L_ADDR_NULL) {
@@ -1236,7 +1236,7 @@ SegmentCleaner::clean_space_ret SegmentCleaner::clean_space()
12361236
// transactions. So, concurrent transactions between trim and reclaim are
12371237
// not allowed right now.
12381238
return seastar::do_with(
1239-
std::pair<std::vector<CachedExtentRef>, backref_pin_list_t>(),
1239+
std::pair<std::vector<CachedExtentRef>, backref_mapping_list_t>(),
12401240
[this](auto &weak_read_ret) {
12411241
return repeat_eagain([this, &weak_read_ret] {
12421242
// Note: not tracked by shard_stats_t intentionally.
@@ -1253,7 +1253,7 @@ SegmentCleaner::clean_space_ret SegmentCleaner::clean_space()
12531253
if (!pin_list.empty()) {
12541254
auto it = pin_list.begin();
12551255
auto &first_pin = *it;
1256-
if (first_pin->get_key() < reclaim_state->start_pos) {
1256+
if (first_pin.get_key() < reclaim_state->start_pos) {
12571257
// BackrefManager::get_mappings may include a entry before
12581258
// reclaim_state->start_pos, which is semantically inconsistent
12591259
// with the requirements of the cleaner

0 commit comments

Comments
 (0)