Skip to content

Commit 076e9a7

Browse files
authored
Merge pull request ceph#52757 from aisakaki/wip-retire-cp
crimson/os/seastore: retire_extent_addr clean up Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 parents 61b8c05 + b99a195 commit 076e9a7

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/crimson/os/seastore/cache.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ Cache::retire_extent_ret Cache::retire_extent_addr(
8585
ext = query_cache(addr, nullptr);
8686
if (ext) {
8787
DEBUGT("retire {}~{} in cache -- {}", t, addr, length, *ext);
88-
if (ext->get_type() != extent_types_t::RETIRED_PLACEHOLDER) {
89-
t.add_to_read_set(ext);
90-
t.add_to_retired_set(ext);
91-
return retire_extent_iertr::now();
92-
}
93-
// the retired-placeholder exists
9488
} else {
9589
// add a new placeholder to Cache
9690
ext = CachedExtent::make_cached_extent_ref<
@@ -105,8 +99,6 @@ Cache::retire_extent_ret Cache::retire_extent_addr(
10599
const auto t_src = t.get_src();
106100
add_extent(ext, &t_src);
107101
}
108-
109-
// add the retired-placeholder to transaction
110102
t.add_to_read_set(ext);
111103
t.add_to_retired_set(ext);
112104
return retire_extent_iertr::now();

0 commit comments

Comments
 (0)