From a436559836aba4acffe8d7e93d67db2873db7322 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Tue, 18 May 2021 15:41:49 +0800 Subject: [PATCH] crimson/onode-staged-tree: cleanup SeastoreSuper::write_root_laddr() Signed-off-by: Yingxin Cheng --- .../staged-fltree/node_extent_manager/seastore.cc | 8 -------- .../staged-fltree/node_extent_manager/seastore.h | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc index 57bb50dc1cbcf..d34f99c76ca39 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc @@ -44,14 +44,6 @@ static DeltaRecorderURef create_replay_recorder( } } -void SeastoreSuper::write_root_laddr(context_t c, laddr_t addr) -{ - DEBUGT("update root {:#x} ...", c.t, addr); - root_addr = addr; - auto nm = static_cast(&c.nm); - nm->get_tm().write_onode_root(c.t, addr); -} - NodeExtentRef SeastoreNodeExtent::mutate( context_t c, DeltaRecorderURef&& _recorder) { diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h index a60dc8ece7941..71c35476b60d1 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h @@ -26,7 +26,12 @@ class SeastoreSuper final: public Super { laddr_t get_root_laddr() const override { return root_addr; } - void write_root_laddr(context_t c, laddr_t addr) override; + void write_root_laddr(context_t c, laddr_t addr) override { + LOG_PREFIX(OTree::Seastore); + DEBUGT("update root {:#x} ...", c.t, addr); + root_addr = addr; + tm.write_onode_root(c.t, addr); + } private: laddr_t root_addr; TransactionManager& tm; -- 2.39.5