From: myoungwon oh <ohmyoungwon@gmail.com>
Date: Thu, 5 May 2022 11:05:29 +0000 (+0900)
Subject: seastore: add maybe_relative_to in blk_paddr_t
X-Git-Tag: v18.0.0~857^2~35
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eabd4868dce782b217a19015ccf33ec48f192995;p=ceph.git

seastore: add maybe_relative_to in blk_paddr_t

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
---

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index b1e2f8b68c31d..10f432f6c095a 100644
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -696,6 +696,10 @@ struct blk_paddr_t : public paddr_t {
     return add_offset(off);
   }
 
+  paddr_t maybe_relative_to(paddr_t base) const {
+    return *this;
+  }
+
 private:
   void check_blk_off_valid(const block_off_t offset) const {
     assert(offset <= BLK_OFF_MAX);
@@ -1813,9 +1817,7 @@ inline paddr_t paddr_t::add_record_relative(paddr_t o) const {
 
 inline paddr_t paddr_t::maybe_relative_to(paddr_t o) const {
   PADDR_OPERATION(addr_types_t::SEGMENT, seg_paddr_t, maybe_relative_to(o))
-  if (get_addr_type() == addr_types_t::RANDOM_BLOCK) {
-    return *this;
-  }
+  PADDR_OPERATION(addr_types_t::RANDOM_BLOCK, blk_paddr_t, maybe_relative_to(o))
   ceph_assert(0 == "not supported type");
   return P_ADDR_NULL;
 }