]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/os/seastore/epm: cleanup unnecessary cache dependency when mark extent ool
authorYingxin Cheng <yingxin.cheng@intel.com>
Thu, 27 Jan 2022 06:03:43 +0000 (14:03 +0800)
committerYingxin Cheng <yingxin.cheng@intel.com>
Fri, 11 Feb 2022 01:26:22 +0000 (09:26 +0800)
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
src/crimson/os/seastore/cache.h
src/crimson/os/seastore/extent_placement_manager.cc

index a63162a45a0918cc549b4f9da866e4d2c9e2e59e..f289794ff90fc8477b482cefab81e9fa25fff440 100644 (file)
@@ -503,26 +503,6 @@ public:
     return ret;
   }
 
-  void mark_delayed_extent_inline(
-    Transaction& t,
-    LogicalCachedExtentRef& ref
-  ) {
-    LOG_PREFIX(Cache::mark_delayed_extent_inline);
-    SUBDEBUGT(seastore_cache, "-- {}", t, *ref);
-    t.mark_delayed_extent_inline(ref);
-  }
-
-  void mark_delayed_extent_ool(
-    Transaction& t,
-    LogicalCachedExtentRef& ref,
-    paddr_t final_addr
-  ) {
-    LOG_PREFIX(Cache::mark_delayed_extent_ool);
-    SUBDEBUGT(seastore_cache, "final_addr={} -- {}",
-              t, final_addr, *ref);
-    t.mark_delayed_extent_ool(ref, final_addr);
-  }
-
   /**
    * alloc_new_extent
    *
index 0da195f23263a7b98668ef8eeb4c77e34318d448..0be43a23d69053e8e2bd3e03e8b3b8b20b18c02c 100644 (file)
@@ -57,10 +57,11 @@ SegmentedAllocator::Writer::finish_write(
       lextent->get_laddr(),
       lextent->get_paddr(),
       ool_extent.get_ool_paddr()
-    ).si_then([&ool_extent, &t, &lextent, this] {
+    ).si_then([&ool_extent, &t, &lextent, this, FNAME] {
       lextent->backend_type = device_type_t::NONE;
       lextent->hint = {};
-      cache.mark_delayed_extent_ool(t, lextent, ool_extent.get_ool_paddr());
+      TRACET("mark extent as ool at {} -- {}", t, ool_extent.get_ool_paddr(), *lextent);
+      t.mark_delayed_extent_ool(lextent, ool_extent.get_ool_paddr());
       return finish_record_iertr::now();
     });
   }).si_then([&record] {