crimson/os/seastore: cleanup delayed paddr

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

diff --git a/src/crimson/os/seastore/seastore_types.cc b/src/crimson/os/seastore/seastore_types.cc
index 9ab7528fb3c3248083ea10811e4a4b08d8016bed..185c88378ddd2a36cb342ca5f1231e4ae7bfbffb 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.cc
+++ b/src/crimson/os/seastore/seastore_types.cc
@@ -64,7 +64,7 @@ std::ostream &operator<<(std::ostream &out, const paddr_t &rhs)
     out << "BLOCK_REG";
   } else if (rhs.is_record_relative()) {
     out << "RECORD_REG";
-  } else if (rhs.get_device_id() == DEVICE_ID_DELAYED) {
+  } else if (rhs.is_delayed()) {
     out << "DELAYED_TEMP";
   } else if (rhs.get_addr_type() == addr_types_t::SEGMENT) {
     const seg_paddr_t& s = rhs.as_seg_paddr();

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 596bc552b578d74031222019cab869d06ffd6163..13527de0ea96baad2a0dfbbc756d159c1dc410eb 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -482,6 +482,9 @@ public:
 
   paddr_t operator-(paddr_t rhs) const;
 
+  bool is_delayed() const {
+    return get_device_id() == DEVICE_ID_DELAYED;
+  }
   bool is_block_relative() const {
     return get_device_id() == DEVICE_ID_BLOCK_RELATIVE;
   }
@@ -667,7 +670,7 @@ constexpr paddr_t make_block_relative_paddr(seastore_off_t off) {
 constexpr paddr_t make_fake_paddr(seastore_off_t off) {
   return paddr_t::make_seg_paddr(FAKE_SEG_ID, off);
 }
-constexpr paddr_t delayed_temp_paddr(seastore_off_t off) {
+constexpr paddr_t make_delayed_temp_paddr(seastore_off_t off) {
   return paddr_t::make_seg_paddr(
     segment_id_t{DEVICE_ID_DELAYED, 0},
     off);

diff --git a/src/crimson/os/seastore/transaction.h b/src/crimson/os/seastore/transaction.h
index 8e4cb8d17f5e49ae465816cebf5fb848c4ee8e9d..f0d35fc9e19b55c9be2c20ccc3c57b746773ee35 100644 (file)
--- a/src/crimson/os/seastore/transaction.h
+++ b/src/crimson/os/seastore/transaction.h
@@ -121,7 +121,7 @@ public:
     ceph_assert(!is_weak());
     if (delayed) {
       assert(ref->is_logical());
-      ref->set_paddr(delayed_temp_paddr(delayed_temp_offset));
+      ref->set_paddr(make_delayed_temp_paddr(delayed_temp_offset));
       delayed_temp_offset += ref->get_length();
       delayed_alloc_list.emplace_back(ref->cast<LogicalCachedExtent>());
     } else {