Skip to content

Commit 096ddce

Browse files
zhscnMatan-B
authored andcommitted
crimson/os/seastore/BackrefManager: adpat new BackrefMapping
Signed-off-by: Zhang Song <[email protected]> (cherry picked from commit 32a8cf1)
1 parent 1ee35a7 commit 096ddce

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/crimson/os/seastore/async_cleaner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@ class SegmentCleaner : public SegmentProvider, public AsyncCleaner {
14871487
using do_reclaim_space_ret = do_reclaim_space_ertr::future<>;
14881488
do_reclaim_space_ret do_reclaim_space(
14891489
const std::vector<CachedExtentRef> &backref_extents,
1490-
const backref_pin_list_t &pin_list,
1490+
const backref_mapping_list_t &pin_list,
14911491
std::size_t &reclaimed,
14921492
std::size_t &runs);
14931493

src/crimson/os/seastore/backref/btree_backref_manager.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ BtreeBackrefManager::get_mapping(
9191
LOG_PREFIX(BtreeBackrefManager::get_mapping);
9292
TRACET("{}", t, offset);
9393
auto c = get_context(t);
94-
return with_btree_ret<BackrefBtree, BackrefMappingRef>(
94+
return with_btree_ret<BackrefBtree, BackrefMapping>(
9595
cache,
9696
c,
9797
[c, offset](auto &btree) {
@@ -107,7 +107,7 @@ BtreeBackrefManager::get_mapping(
107107
c.trans, offset, iter.get_key(), iter.get_val());
108108
return get_mapping_ret(
109109
interruptible::ready_future_marker{},
110-
iter.get_pin(c));
110+
BackrefMapping::create(iter.get_cursor(c)));
111111
}
112112
});
113113
});
@@ -122,7 +122,7 @@ BtreeBackrefManager::get_mappings(
122122
LOG_PREFIX(BtreeBackrefManager::get_mappings);
123123
TRACET("{}~{}", t, offset, end);
124124
auto c = get_context(t);
125-
return with_btree_state<BackrefBtree, backref_pin_list_t>(
125+
return with_btree_state<BackrefBtree, backref_mapping_list_t>(
126126
cache,
127127
c,
128128
[c, offset, end](auto &btree, auto &ret) {
@@ -141,7 +141,7 @@ BtreeBackrefManager::get_mappings(
141141
TRACET("{}~{} got {}, {}, repeat ...",
142142
c.trans, offset, end, pos.get_key(), pos.get_val());
143143
ceph_assert((pos.get_key().add_offset(pos.get_val().len)) > offset);
144-
ret.emplace_back(pos.get_pin(c));
144+
ret.emplace_back(BackrefMapping::create(pos.get_cursor(c)));
145145
return BackrefBtree::iterate_repeat_ret_inner(
146146
interruptible::ready_future_marker{},
147147
seastar::stop_iteration::no);
@@ -237,8 +237,8 @@ BtreeBackrefManager::new_mapping(
237237
});
238238
});
239239
}).si_then([c](auto &&state) {
240-
return new_mapping_iertr::make_ready_future<BackrefMappingRef>(
241-
state.ret->get_pin(c));
240+
return new_mapping_iertr::make_ready_future<BackrefMapping>(
241+
BackrefMapping::create(state.ret->get_cursor(c)));
242242
});
243243
}
244244

src/crimson/os/seastore/backref_manager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class BackrefManager {
3030
* Future will not resolve until all pins have resolved
3131
*/
3232
using get_mappings_iertr = base_iertr;
33-
using get_mappings_ret = get_mappings_iertr::future<backref_pin_list_t>;
33+
using get_mappings_ret = get_mappings_iertr::future<backref_mapping_list_t>;
3434
virtual get_mappings_ret get_mappings(
3535
Transaction &t,
3636
paddr_t offset,
@@ -43,7 +43,7 @@ class BackrefManager {
4343
*/
4444
using get_mapping_iertr = base_iertr::extend<
4545
crimson::ct_error::enoent>;
46-
using get_mapping_ret = get_mapping_iertr::future<BackrefMappingRef>;
46+
using get_mapping_ret = get_mapping_iertr::future<BackrefMapping>;
4747
virtual get_mapping_ret get_mapping(
4848
Transaction &t,
4949
paddr_t offset) = 0;
@@ -63,7 +63,7 @@ class BackrefManager {
6363
* Insert new paddr_t -> laddr_t mapping
6464
*/
6565
using new_mapping_iertr = base_iertr;
66-
using new_mapping_ret = new_mapping_iertr::future<BackrefMappingRef>;
66+
using new_mapping_ret = new_mapping_iertr::future<BackrefMapping>;
6767
virtual new_mapping_ret new_mapping(
6868
Transaction &t,
6969
paddr_t key,

0 commit comments

Comments
 (0)