crimson/os/seastore/cache: cleanup, use the same method to create extents

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index 70fec7caca48aa95c5f9bec7a520caf22fd20a4b..0a1c2b576bb633efa296f13e5f1697d0481eea52 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -1826,7 +1826,7 @@ void Cache::init()
     remove_extent(root, nullptr);
     root = nullptr;
   }
-  root = new RootBlock();
+  root = CachedExtent::make_cached_extent_ref<RootBlock>();
   root->init(CachedExtent::extent_state_t::CLEAN,
              P_ADDR_ROOT,
              PLACEMENT_HINT_NULL,

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index cd65d82fe5a85b8895470ede7e2872ae2431a74e..e93e0f91a9b4f6ec89aaf0575ef7700346f2f767 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -1068,7 +1068,7 @@ public:
       // (relative/temp) paddr, so make extent directly
       ext = CachedExtent::make_cached_extent_ref<T>(std::move(nbp));
     } else {
-      ext = CachedExtent::make_placeholder_cached_extent_ref<T>(remap_length);
+      ext = CachedExtent::make_cached_extent_ref<T>(remap_length);
     }
 
     ext->init(CachedExtent::extent_state_t::EXIST_CLEAN,

diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h
index 8443c99b90a92b0c541741e9b0214e4d9a14fc8e..99bad9094bf75447e9983230a443290b40db6b86 100644 (file)
--- a/src/crimson/os/seastore/cached_extent.h
+++ b/src/crimson/os/seastore/cached_extent.h
@@ -816,9 +816,8 @@ protected:
   }
 
   template <typename T>
-  static TCachedExtentRef<T> make_placeholder_cached_extent_ref(
-    extent_len_t length) {
-    return new T(length);
+  static TCachedExtentRef<T> make_cached_extent_ref() {
+    return new T();
   }
 
   void reset_prior_instance() {