]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/seastore: retire_extent_addr clean up 53959/head
authorXinyu Huang <xinyu.huang@intel.com>
Wed, 2 Aug 2023 02:09:52 +0000 (10:09 +0800)
committerMatan Breizman <mbreizma@redhat.com>
Wed, 11 Oct 2023 11:47:25 +0000 (11:47 +0000)
Signed-off-by: Xinyu Huang <xinyu.huang@intel.com>
(cherry picked from commit b99a1956bdcb879a3e5440e617593bae43fafd62)

src/crimson/os/seastore/cache.cc

index d6c9fdce3aa6381cedecacca5390bd9c3908face..ea5ff5d937dc14cb5986d130a88429941d30c30c 100644 (file)
@@ -85,12 +85,6 @@ Cache::retire_extent_ret Cache::retire_extent_addr(
   ext = query_cache(addr, nullptr);
   if (ext) {
     DEBUGT("retire {}~{} in cache -- {}", t, addr, length, *ext);
-    if (ext->get_type() != extent_types_t::RETIRED_PLACEHOLDER) {
-      t.add_to_read_set(ext);
-      t.add_to_retired_set(ext);
-      return retire_extent_iertr::now();
-    }
-    // the retired-placeholder exists
   } else {
     // add a new placeholder to Cache
     ext = CachedExtent::make_cached_extent_ref<
@@ -105,8 +99,6 @@ Cache::retire_extent_ret Cache::retire_extent_addr(
     const auto t_src = t.get_src();
     add_extent(ext, &t_src);
   }
-
-  // add the retired-placeholder to transaction
   t.add_to_read_set(ext);
   t.add_to_retired_set(ext);
   return retire_extent_iertr::now();