From bcd5c73540c14b543fcad77f8e0d5a66b3a871e6 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Thu, 27 Jan 2022 14:03:43 +0800 Subject: [PATCH] crimson/os/seastore/epm: cleanup unnecessary cache dependency when mark extent ool Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/cache.h | 20 ------------------- .../os/seastore/extent_placement_manager.cc | 5 +++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index a63162a45a0..f289794ff90 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -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 * diff --git a/src/crimson/os/seastore/extent_placement_manager.cc b/src/crimson/os/seastore/extent_placement_manager.cc index 0da195f2326..0be43a23d69 100644 --- a/src/crimson/os/seastore/extent_placement_manager.cc +++ b/src/crimson/os/seastore/extent_placement_manager.cc @@ -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] { -- 2.39.5