crimson/os/seastore: use extent_len_t where appropriate

Replacing inappropriate usages of seastore_off_t.

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

diff --git a/src/crimson/os/seastore/async_cleaner.h b/src/crimson/os/seastore/async_cleaner.h
index 033be6a853fb9d6dbcd0b5555867f82debeb6049..292ffd080752a1b89b7601540685ab6b6e9e8517 100644 (file)
--- a/src/crimson/os/seastore/async_cleaner.h
+++ b/src/crimson/os/seastore/async_cleaner.h
@@ -348,7 +348,7 @@ public:
     extent_types_t type,
     paddr_t addr,
     laddr_t laddr,
-    seastore_off_t len) = 0;
+    extent_len_t len) = 0;
 
   /**
    * submit_transaction_direct

diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc
index 01c96cf841fed5cbb66be9146981e021da7df09d..ae2da76527eaddf7bd7a399d60ee7d2c22583d48 100644 (file)
--- a/src/crimson/os/seastore/backref/btree_backref_manager.cc
+++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc
@@ -126,7 +126,7 @@ BtreeBackrefManager::new_mapping(
       key.get_addr_type() == paddr_types_t::SEGMENT ?
        key.as_seg_paddr().get_segment_off() :
        key.as_blk_paddr().get_block_off(),
-      (uint64_t)cache.get_block_size()));
+      cache.get_block_size()));
   struct state_t {
     paddr_t last_end;
 
@@ -322,7 +322,7 @@ BtreeBackrefManager::scan_mapped_space(
           c,
           btree.lower_bound(
             c,
-            paddr_t::make_seg_paddr(segment_id_t{0, 0}, 0),
+            P_ADDR_MIN,
             &tree_visitor),
           [c, &scan_visitor, block_size, FNAME](auto &pos) {
             if (pos.is_end()) {

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index 7ee2c5ff122cb863d0bbf5824170483885cdc22e..1ea09d0e5987356bec2e976ad6368e14ede89811 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -722,7 +722,7 @@ public:
     op_context_t<node_key_t> c,
     paddr_t addr,
     node_key_t laddr,
-    seastore_off_t len)
+    extent_len_t len)
   {
     LOG_PREFIX(FixedKVBtree::get_leaf_if_live);
     return lower_bound(
@@ -760,7 +760,7 @@ public:
     op_context_t<node_key_t> c,
     paddr_t addr,
     node_key_t laddr,
-    seastore_off_t len)
+    extent_len_t len)
   {
     LOG_PREFIX(FixedKVBtree::get_internal_if_live);
     return lower_bound(

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index 1d329ed582acbdf11683684d3da0465e767c2cc0..80d09889b1b2e8ba98b0e351826162720b5095e7 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -942,7 +942,7 @@ void Cache::on_transaction_destruct(Transaction& t)
 CachedExtentRef Cache::alloc_new_extent_by_type(
   Transaction &t,        ///< [in, out] current transaction
   extent_types_t type,   ///< [in] type tag
-  seastore_off_t length, ///< [in] length
+  extent_len_t length,   ///< [in] length
   placement_hint_t hint, ///< [in] user hint
   reclaim_gen_t gen      ///< [in] reclaim generation
 )
@@ -1123,7 +1123,7 @@ record_t Cache::prepare_record(
           : L_ADDR_NULL),
          i->last_committed_crc,
          final_crc,
-         (seastore_off_t)i->get_length(),
+         i->get_length(),
          i->get_version() - 1,
          sseq,
          stype,
@@ -1897,7 +1897,7 @@ Cache::get_extent_ertr::future<CachedExtentRef> Cache::_get_extent_by_type(
   extent_types_t type,
   paddr_t offset,
   laddr_t laddr,
-  seastore_off_t length,
+  extent_len_t length,
   const Transaction::src_t* p_src,
   extent_init_func_t &&extent_init_func,
   extent_init_func_t &&on_cache)

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index c8443227e6088cb21aa5c19d8a1e740489b96c54..7f12f1f3fb9f483ca160c59a571bf78f0283cb26 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -271,8 +271,8 @@ public:
   template <typename T, typename Func, typename OnCache>
   get_extent_ret<T> get_extent(
     paddr_t offset,                ///< [in] starting addr
-    seastore_off_t length,          ///< [in] length
-    const src_ext_t* p_src_ext, ///< [in] cache query metric key
+    extent_len_t length,           ///< [in] length
+    const src_ext_t* p_src_ext,    ///< [in] cache query metric key
     Func &&extent_init_func,       ///< [in] init func for extent
     OnCache &&on_cache
   ) {
@@ -339,7 +339,7 @@ public:
   template <typename T>
   get_extent_ret<T> get_extent(
     paddr_t offset,                ///< [in] starting addr
-    seastore_off_t length,          ///< [in] length
+    extent_len_t length,           ///< [in] length
     const src_ext_t* p_metric_key  ///< [in] cache query metric key
   ) {
     return get_extent<T>(
@@ -414,7 +414,7 @@ public:
   get_extent_iertr::future<TCachedExtentRef<T>> get_extent(
     Transaction &t,
     paddr_t offset,
-    seastore_off_t length,
+    extent_len_t length,
     Func &&extent_init_func) {
     CachedExtentRef ret;
     LOG_PREFIX(Cache::get_extent);
@@ -451,11 +451,11 @@ public:
   get_extent_iertr::future<TCachedExtentRef<T>> get_extent(
     Transaction &t,
     paddr_t offset,
-    seastore_off_t length) {
+    extent_len_t length) {
     return get_extent<T>(t, offset, length, [](T &){});
   }
 
-  seastore_off_t get_block_size() const {
+  extent_len_t get_block_size() const {
     return epm.get_block_size();
   }
 
@@ -490,7 +490,7 @@ private:
     extent_types_t type,
     paddr_t offset,
     laddr_t laddr,
-    seastore_off_t length,
+    extent_len_t length,
     const Transaction::src_t* p_src,
     extent_init_func_t &&extent_init_func,
     extent_init_func_t &&on_cache
@@ -504,7 +504,7 @@ private:
     extent_types_t type,
     paddr_t offset,
     laddr_t laddr,
-    seastore_off_t length,
+    extent_len_t length,
     extent_init_func_t &&extent_init_func
   ) {
     LOG_PREFIX(Cache::get_extent_by_type);
@@ -580,7 +580,7 @@ public:
     extent_types_t type,    ///< [in] type tag
     paddr_t offset,         ///< [in] starting addr
     laddr_t laddr,          ///< [in] logical address if logical
-    seastore_off_t length,   ///< [in] length
+    extent_len_t length,    ///< [in] length
     Func &&extent_init_func ///< [in] extent init func
   ) {
     return _get_extent_by_type(
@@ -596,7 +596,7 @@ public:
     extent_types_t type,
     paddr_t offset,
     laddr_t laddr,
-    seastore_off_t length
+    extent_len_t length
   ) {
     return get_extent_by_type(
       t, type, offset, laddr, length, [](CachedExtent &) {});
@@ -627,7 +627,7 @@ public:
   template <typename T>
   TCachedExtentRef<T> alloc_new_extent(
     Transaction &t,         ///< [in, out] current transaction
-    seastore_off_t length,  ///< [in] length
+    extent_len_t length,    ///< [in] length
     placement_hint_t hint,  ///< [in] user hint
     reclaim_gen_t gen       ///< [in] reclaim generation
   ) {
@@ -656,7 +656,7 @@ public:
   CachedExtentRef alloc_new_extent_by_type(
     Transaction &t,        ///< [in, out] current transaction
     extent_types_t type,   ///< [in] type tag
-    seastore_off_t length, ///< [in] length
+    extent_len_t length,   ///< [in] length
     placement_hint_t hint, ///< [in] user hint
     reclaim_gen_t gen      ///< [in] reclaim generation
     );

diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h
index 115d518e36f2f7800717ccfccef983f669305ced..05cf563866409e48ffd34d03e242dada2cf55239 100644 (file)
--- a/src/crimson/os/seastore/cached_extent.h
+++ b/src/crimson/os/seastore/cached_extent.h
@@ -619,7 +619,7 @@ class ExtentIndex {
   friend class Cache;
   CachedExtent::index extent_index;
 public:
-  auto get_overlap(paddr_t addr, seastore_off_t len) {
+  auto get_overlap(paddr_t addr, extent_len_t len) {
     auto bottom = extent_index.upper_bound(addr, paddr_cmp());
     if (bottom != extent_index.begin())
       --bottom;

diff --git a/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc b/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc
index 5b3d5bc1fe70a20be6e0f814ea187222aae72f19..15ce920ec0a6eff361e51185aab0706349878a0b 100644 (file)
--- a/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc
+++ b/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc
@@ -18,8 +18,8 @@ namespace {
 
 namespace crimson::os::seastore::collection_manager {
 
-constexpr static seastore_off_t MIN_FLAT_BLOCK_SIZE = 4<<10;
-[[maybe_unused]] constexpr static seastore_off_t MAX_FLAT_BLOCK_SIZE = 4<<20;
+constexpr static extent_len_t MIN_FLAT_BLOCK_SIZE = 4<<10;
+[[maybe_unused]] constexpr static extent_len_t MAX_FLAT_BLOCK_SIZE = 4<<20;
 
 FlatCollectionManager::FlatCollectionManager(
   TransactionManager &tm)

diff --git a/src/crimson/os/seastore/device.h b/src/crimson/os/seastore/device.h
index c9395cba4086bb928ccd4f7616ed288ece323397..aeff3d9595b1d39716249d1f77d4dce3ab67f2e7 100644 (file)
--- a/src/crimson/os/seastore/device.h
+++ b/src/crimson/os/seastore/device.h
@@ -71,7 +71,7 @@ public:
 
   virtual const seastore_meta_t &get_meta() const = 0;
 
-  virtual seastore_off_t get_block_size() const = 0;
+  virtual extent_len_t get_block_size() const = 0;
 
   virtual std::size_t get_available_size() const = 0;
 

diff --git a/src/crimson/os/seastore/extent_placement_manager.h b/src/crimson/os/seastore/extent_placement_manager.h
index 9307cbf506cf6e5cda3fcfc6033e110707c3cd8c..0804e7d1c252b9688ddcd538390364cdc9b70297 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.h
+++ b/src/crimson/os/seastore/extent_placement_manager.h
@@ -100,7 +100,7 @@ public:
     return background_process.get_journal_type();
   }
 
-  seastore_off_t get_block_size() const {
+  extent_len_t get_block_size() const {
     assert(primary_device != nullptr);
     // assume all the devices have the same block size
     return primary_device->get_block_size();
@@ -141,7 +141,7 @@ public:
   alloc_result_t alloc_new_extent(
     Transaction& t,
     extent_types_t type,
-    seastore_off_t length,
+    extent_len_t length,
     placement_hint_t hint,
     reclaim_gen_t gen
   ) {

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
index b06c81b5f290d71f2841a9b87f95316e55c1315c..fd8df2f9da467aacde8696a666b1b51a510074af 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
@@ -36,8 +36,7 @@ CircularBoundedJournal::mkfs(const mkfs_config_t& config)
 {
   LOG_PREFIX(CircularBoundedJournal::mkfs);
   assert(device);
-  assert(static_cast<seastore_off_t>(config.block_size) ==
-    device->get_block_size());
+  assert(config.block_size == device->get_block_size());
   ceph::bufferlist bl;
   CircularBoundedJournal::cbj_header_t head;
   head.block_size = config.block_size;
@@ -168,7 +167,7 @@ CircularBoundedJournal::submit_record_ret CircularBoundedJournal::submit_record(
 
   auto write_result = write_result_t{
     j_seq,
-    (seastore_off_t)encoded_size
+    encoded_size
   };
   auto write_fut = device_write_bl(target, to_write);
   return handle.enter(write_pipeline->device_submission
@@ -320,7 +319,7 @@ Journal::replay_ret CircularBoundedJournal::replay(
          DEBUG("{} at {}", r_header, cursor_addr);
          auto write_result = write_result_t{
            r_header.committed_to,
-           (seastore_off_t)bl.length()
+           bl.length()
          };
          if (expected_seq == NULL_SEG_SEQ) {
            expected_seq = r_header.committed_to.segment_seq;

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h
index 7276a133df907da450e68ff64a2367005d478655..40148c3c6b336ee5f3d04cf4b4fe5c4a00a31e1a 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.h
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h
@@ -291,7 +291,7 @@ public:
   device_id_t get_device_id() const {
     return header.device_id;
   }
-  size_t get_block_size() const {
+  extent_len_t get_block_size() const {
     return header.block_size;
   }
   rbm_abs_addr get_journal_end() const {

diff --git a/src/crimson/os/seastore/journal/segment_allocator.cc b/src/crimson/os/seastore/journal/segment_allocator.cc
index 4607d056586f2a702aa21b87516ecda2a93673e1..67a362b79dbc001b2d7fbc160621576c03264b69 100644 (file)
--- a/src/crimson/os/seastore/journal/segment_allocator.cc
+++ b/src/crimson/os/seastore/journal/segment_allocator.cc
@@ -174,7 +174,7 @@ SegmentAllocator::write(ceph::bufferlist&& to_write)
 
   auto write_result = write_result_t{
     write_start_seq,
-    static_cast<seastore_off_t>(write_length)
+    write_length
   };
   written_to += write_length;
   segment_provider.update_segment_avail_bytes(
@@ -331,7 +331,7 @@ RecordBatch::encode_batch(
   submitting_mdlength = gsize.get_mdlength();
   auto bl = encode_records(pending, committed_to, segment_nonce);
   // Note: pending is cleared here
-  assert(bl.length() == (std::size_t)submitting_length);
+  assert(bl.length() == submitting_length);
   return std::make_pair(bl, gsize);
 }
 

diff --git a/src/crimson/os/seastore/journal/segment_allocator.h b/src/crimson/os/seastore/journal/segment_allocator.h
index f437979e0c2c902bcf5f8b50c0c6938bc9b6c392..191f8180403de02d31338046426bcfd2f845507f 100644 (file)
--- a/src/crimson/os/seastore/journal/segment_allocator.h
+++ b/src/crimson/os/seastore/journal/segment_allocator.h
@@ -45,7 +45,7 @@ class SegmentAllocator {
     return segment_provider;
   }
 
-  seastore_off_t get_block_size() const {
+  extent_len_t get_block_size() const {
     return sm_group.get_block_size();
   }
 
@@ -265,12 +265,12 @@ private:
 
   record_group_t pending;
   std::size_t submitting_size = 0;
-  seastore_off_t submitting_length = 0;
-  seastore_off_t submitting_mdlength = 0;
+  extent_len_t submitting_length = 0;
+  extent_len_t submitting_mdlength = 0;
 
   struct promise_result_t {
     write_result_t write_result;
-    seastore_off_t mdlength;
+    extent_len_t mdlength;
   };
   using maybe_promise_result_t = std::optional<promise_result_t>;
   std::optional<seastar::shared_promise<maybe_promise_result_t> > io_promise;

diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h
index a897b74acd8f808826ba94744a234f6f3c56797a..9df5eef0010f3195876e5c92af8f95243809c3b3 100644 (file)
--- a/src/crimson/os/seastore/lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager.h
@@ -197,7 +197,7 @@ public:
     extent_types_t type,
     paddr_t addr,
     laddr_t laddr,
-    seastore_off_t len) = 0;
+    extent_len_t len) = 0;
 
   virtual void add_pin(LBAPin &pin) = 0;
 

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
index 7b173a23f0f1176047b26babf4bf23bd6ac23399..63130f7b476c02f323be2e1b80bdcaeaffad107a 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
@@ -435,7 +435,7 @@ BtreeLBAManager::get_physical_extent_if_live(
   extent_types_t type,
   paddr_t addr,
   laddr_t laddr,
-  seastore_off_t len)
+  extent_len_t len)
 {
   LOG_PREFIX(BtreeLBAManager::get_physical_extent_if_live);
   DEBUGT("{}, laddr={}, paddr={}, length={}",

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
index 38e7f18da55b03691b027753e9bcf0637ee90416..3b0aa4aafd4edfc409d03fb8ee118acb64d3114f 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
@@ -136,7 +136,7 @@ public:
     extent_types_t type,
     paddr_t addr,
     laddr_t laddr,
-    seastore_off_t len) final;
+    extent_len_t len) final;
 
   void add_pin(LBAPin &pin) final {
     auto *bpin = reinterpret_cast<BtreeLBAPin*>(&pin);

diff --git a/src/crimson/os/seastore/random_block_manager.h b/src/crimson/os/seastore/random_block_manager.h
index f9922f75458cccf211c9b0066e8a17e8a2bdde1c..e6fc09834f5928c644f61e82bfd5f970c7897881 100644 (file)
--- a/src/crimson/os/seastore/random_block_manager.h
+++ b/src/crimson/os/seastore/random_block_manager.h
@@ -92,7 +92,7 @@ public:
   virtual write_ertr::future<> complete_allocation(Transaction &t) = 0;
 
   virtual size_t get_size() const = 0;
-  virtual size_t get_block_size() const = 0;
+  virtual extent_len_t get_block_size() const = 0;
   virtual uint64_t get_free_blocks() const = 0;
   virtual device_id_t get_device_id() const = 0;
   virtual ~RandomBlockManager() {}

diff --git a/src/crimson/os/seastore/random_block_manager/block_rb_manager.h b/src/crimson/os/seastore/random_block_manager/block_rb_manager.h
index da575fc61f404362a5705f18ccf1169ed2b7565a..356cba2234e017a28109e9b3ee2df493a0b08840 100644 (file)
--- a/src/crimson/os/seastore/random_block_manager/block_rb_manager.h
+++ b/src/crimson/os/seastore/random_block_manager/block_rb_manager.h
@@ -221,7 +221,7 @@ public:
   write_ertr::future<> write_rbm_header();
 
   size_t get_size() const final { return super.size; };
-  size_t get_block_size() const final { return super.block_size; }
+  extent_len_t get_block_size() const final { return super.block_size; }
 
   // max block number a block can represent using bitmap
   uint64_t max_block_by_bitmap_block() {

diff --git a/src/crimson/os/seastore/random_block_manager/rbm_device.h b/src/crimson/os/seastore/random_block_manager/rbm_device.h
index d789813e179a99a18c7de7789f6909ea9e956432..4a4b720ea2ecb7d6df2956ea0d4dab27f88f307b 100644 (file)
--- a/src/crimson/os/seastore/random_block_manager/rbm_device.h
+++ b/src/crimson/os/seastore/random_block_manager/rbm_device.h
@@ -119,8 +119,8 @@ public:
   secondary_device_set_t& get_secondary_devices() final {
     return devices;
   }
-  std::size_t get_available_size() const { return size; }
-  seastore_off_t get_block_size() const { return block_size; }
+  std::size_t get_available_size() const final { return size; }
+  extent_len_t get_block_size() const final { return block_size; }
 
   virtual read_ertr::future<> read(
     uint64_t offset,

diff --git a/src/crimson/os/seastore/root_block.h b/src/crimson/os/seastore/root_block.h
index e0484c1cb0525d193fa4dfc9e394ce7b80e86405..1d329d64e0262b67de467397b584eaea521762db 100644 (file)
--- a/src/crimson/os/seastore/root_block.h
+++ b/src/crimson/os/seastore/root_block.h
@@ -33,7 +33,7 @@ namespace crimson::os::seastore {
  * mutation which changes the journal trim bound.
  */
 struct RootBlock : CachedExtent {
-  constexpr static seastore_off_t SIZE = 4<<10;
+  constexpr static extent_len_t SIZE = 4<<10;
   using Ref = TCachedExtentRef<RootBlock>;
 
   root_t root;

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 197331819b210dd862ccb96a3d1e2c05881f1fd9..dcbff8e40e39f8e3cfeeacd36f4ac53f4561d34e 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -1204,7 +1204,7 @@ struct delta_info_t {
   laddr_t laddr = L_ADDR_NULL;                 ///< logical address
   uint32_t prev_crc = 0;
   uint32_t final_crc = 0;
-  seastore_off_t length = NULL_SEG_OFF;         ///< extent length
+  extent_len_t length = NULL_SEG_OFF;          ///< extent length
   extent_version_t pversion;                   ///< prior version
   segment_seq_t ext_seq;                      ///< seq of the extent's segment
   segment_type_t seg_type;
@@ -1482,7 +1482,7 @@ class __attribute__((packed)) coll_root_le_t {
 public:
   coll_root_le_t() = default;
   
-  coll_root_le_t(laddr_t laddr, seastore_off_t size)
+  coll_root_le_t(laddr_t laddr, extent_len_t size)
     : addr(laddr), size(init_extent_len_le(size)) {}
 
 
@@ -1971,7 +1971,7 @@ try_decode_deltas(
 
 struct write_result_t {
   journal_seq_t start_seq;
-  seastore_off_t length;
+  extent_len_t length;
 
   journal_seq_t get_end_seq() const {
     return journal_seq_t{

diff --git a/src/crimson/os/seastore/segment_manager/block.h b/src/crimson/os/seastore/segment_manager/block.h
index e4a1ee2ad086e4d321c6b4ebededc800846043cf..6da39d38a51b940612d56ed5dcfcd4dc156ab330 100644 (file)
--- a/src/crimson/os/seastore/segment_manager/block.h
+++ b/src/crimson/os/seastore/segment_manager/block.h
@@ -135,7 +135,7 @@ public:
   size_t get_available_size() const final {
     return superblock.size;
   }
-  seastore_off_t get_block_size() const {
+  extent_len_t get_block_size() const {
     return superblock.block_size;
   }
   seastore_off_t get_segment_size() const {

diff --git a/src/crimson/os/seastore/segment_manager/ephemeral.h b/src/crimson/os/seastore/segment_manager/ephemeral.h
index e97d2ffdaa6ed794efb9efea281c56e2f1e1a45f..a9a235384864ec368dfc59144b3a3c8f56d06c79 100644 (file)
--- a/src/crimson/os/seastore/segment_manager/ephemeral.h
+++ b/src/crimson/os/seastore/segment_manager/ephemeral.h
@@ -117,7 +117,7 @@ public:
   size_t get_available_size() const final {
     return config.size;
   }
-  seastore_off_t get_block_size() const final {
+  extent_len_t get_block_size() const final {
     return config.block_size;
   }
   seastore_off_t get_segment_size() const final {

diff --git a/src/crimson/os/seastore/segment_manager/zns.h b/src/crimson/os/seastore/segment_manager/zns.h
index cb33a4718ebc611a185d44f1c0766e3b98247612..574fe92aaf1794a75d6f2bc69ab06efb7a04900e 100644 (file)
--- a/src/crimson/os/seastore/segment_manager/zns.h
+++ b/src/crimson/os/seastore/segment_manager/zns.h
@@ -112,7 +112,7 @@ namespace crimson::os::seastore::segment_manager::zns {
       return metadata.size;
     };
 
-    seastore_off_t get_block_size() const final {
+    extent_len_t get_block_size() const final {
       return metadata.block_size;
     };
 

diff --git a/src/crimson/os/seastore/segment_manager_group.cc b/src/crimson/os/seastore/segment_manager_group.cc
index 11eebc742f14f11b82ac65be78fe153d5f27fa28..489562100d5a46b031313ba8490c3271283eadf3 100644 (file)
--- a/src/crimson/os/seastore/segment_manager_group.cc
+++ b/src/crimson/os/seastore/segment_manager_group.cc
@@ -214,8 +214,7 @@ SegmentManagerGroup::read_validate_record_metadata(
   return segment_manager.read(start, block_size
   ).safe_then([=, &segment_manager](bufferptr bptr) mutable
               -> read_validate_record_metadata_ret {
-    auto block_size = static_cast<extent_len_t>(
-        segment_manager.get_block_size());
+    auto block_size = segment_manager.get_block_size();
     bufferlist bl;
     bl.append(bptr);
     auto maybe_header = try_decode_records_header(bl, nonce);
@@ -244,7 +243,7 @@ SegmentManagerGroup::read_validate_record_metadata(
 
     auto rest_start = paddr_t::make_seg_paddr(
         seg_addr.get_segment_id(),
-        seg_addr.get_segment_off() + (seastore_off_t)block_size
+        seg_addr.get_segment_off() + block_size
     );
     auto rest_len = header.mdlength - block_size;
     TRACE("reading record group header rest {}~{}", rest_start, rest_len);
@@ -307,7 +306,7 @@ SegmentManagerGroup::consume_next_records(
         cursor.seq.segment_seq,
         next.offset
       },
-      static_cast<seastore_off_t>(total_length)
+      total_length
     }
   };
   DEBUG("processing {} at {}, budget_used={}",

diff --git a/src/crimson/os/seastore/segment_manager_group.h b/src/crimson/os/seastore/segment_manager_group.h
index 3dccdf9213408654eb302030c72918f920b739dc..d5b22f436df991b84d250d46084da0c0382cbb3b 100644 (file)
--- a/src/crimson/os/seastore/segment_manager_group.h
+++ b/src/crimson/os/seastore/segment_manager_group.h
@@ -50,7 +50,7 @@ public:
    *
    * Assume all segment managers share the same following information.
    */
-  seastore_off_t get_block_size() const {
+  extent_len_t get_block_size() const {
     assert(device_ids.size());
     return segment_managers[*device_ids.begin()]->get_block_size();
   }

diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index 459ffac733fe549239321e455437754c665618de..3b7812d48cc450f71e89779dd53f908d73d54d59 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -527,7 +527,7 @@ TransactionManager::get_extents_if_live(
   extent_types_t type,
   paddr_t paddr,
   laddr_t laddr,
-  seastore_off_t len)
+  extent_len_t len)
 {
   LOG_PREFIX(TransactionManager::get_extent_if_live);
   TRACET("{} {}~{} {}", t, type, laddr, len, paddr);
@@ -539,7 +539,7 @@ TransactionManager::get_extents_if_live(
   return cache->get_extent_if_cached(t, paddr, type
   ).si_then([=, this, &t](auto extent)
            -> get_extents_if_live_ret {
-    if (extent && extent->get_length() == (extent_len_t)len) {
+    if (extent && extent->get_length() == len) {
       DEBUGT("{} {}~{} {} is live in cache -- {}",
              t, type, laddr, len, paddr, *extent);
       std::list<CachedExtentRef> res;

diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h
index f72d74be2e6941c640b74f5855571b9e54ef31b4..3945537708cd1fb3f3d6286c9f37f34c1bac552a 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.h
+++ b/src/crimson/os/seastore/transaction_manager.h
@@ -315,7 +315,7 @@ public:
     LOG_PREFIX(TransactionManager::alloc_extent);
     SUBTRACET(seastore_tm, "{} len={}, placement_hint={}, laddr_hint={}",
               t, T::TYPE, len, placement_hint, laddr_hint);
-    ceph_assert(is_aligned(laddr_hint, (uint64_t)epm->get_block_size()));
+    ceph_assert(is_aligned(laddr_hint, epm->get_block_size()));
     auto ext = cache->alloc_new_extent<T>(
       t,
       len,
@@ -402,7 +402,7 @@ public:
     extent_len_t len) {
     LOG_PREFIX(TransactionManager::reserve_region);
     SUBDEBUGT(seastore_tm, "len={}, laddr_hint={}", t, len, hint);
-    ceph_assert(is_aligned(hint, (uint64_t)epm->get_block_size()));
+    ceph_assert(is_aligned(hint, epm->get_block_size()));
     return lba_manager->alloc_extent(
       t,
       hint,
@@ -495,7 +495,7 @@ public:
     extent_types_t type,
     paddr_t paddr,
     laddr_t laddr,
-    seastore_off_t len) final;
+    extent_len_t len) final;
 
   /**
    * read_root_meta

diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc
index 7df85d1b2d1a9f8ef3b33a87a88b5b3b613f21f3..310e5ed00ca6177e46fcdc271be296590de00bf9 100644 (file)
--- a/src/crimson/tools/store_nbd/tm_driver.cc
+++ b/src/crimson/tools/store_nbd/tm_driver.cc
@@ -19,7 +19,7 @@ seastar::future<> TMDriver::write(
 {
   logger().debug("Writing offset {}", offset);
   assert(offset % device->get_block_size() == 0);
-  assert((ptr.length() % (size_t)device->get_block_size()) == 0);
+  assert((ptr.length() % device->get_block_size()) == 0);
   return seastar::do_with(ptr, [this, offset](auto& ptr) {
     return repeat_eagain([this, offset, &ptr] {
       return tm->with_transaction_intr(
@@ -94,7 +94,7 @@ seastar::future<bufferlist> TMDriver::read(
 {
   logger().debug("Reading offset {}", offset);
   assert(offset % device->get_block_size() == 0);
-  assert(size % (size_t)device->get_block_size() == 0);
+  assert(size % device->get_block_size() == 0);
   auto blptrret = std::make_unique<bufferlist>();
   auto &blret = *blptrret;
   return repeat_eagain([=, &blret, this] {

diff --git a/src/test/crimson/seastore/test_block.h b/src/test/crimson/seastore/test_block.h
index c6f88b8cd8894c5b5771755ac9d19ad57287eb2a..e53557685a3dca621058b1739f51e3545e79582a 100644 (file)
--- a/src/test/crimson/seastore/test_block.h
+++ b/src/test/crimson/seastore/test_block.h
@@ -44,7 +44,7 @@ inline std::ostream &operator<<(
 }
 
 struct TestBlock : crimson::os::seastore::LogicalCachedExtent {
-  constexpr static seastore_off_t SIZE = 4<<10;
+  constexpr static extent_len_t SIZE = 4<<10;
   using Ref = TCachedExtentRef<TestBlock>;
 
   std::vector<test_block_delta_t> delta = {};
@@ -83,7 +83,7 @@ struct TestBlock : crimson::os::seastore::LogicalCachedExtent {
 using TestBlockRef = TCachedExtentRef<TestBlock>;
 
 struct TestBlockPhysical : crimson::os::seastore::CachedExtent{
-  constexpr static seastore_off_t SIZE = 4<<10;
+  constexpr static extent_len_t SIZE = 4<<10;
   using Ref = TCachedExtentRef<TestBlockPhysical>;
 
   std::vector<test_block_delta_t> delta = {};

diff --git a/src/test/crimson/seastore/test_seastore_journal.cc b/src/test/crimson/seastore/test_seastore_journal.cc
index ac190c78102b161fd92c64d5d86b4738496641bf..29a0ca2d0609ca7c1c071bce4cc42f66a491dc57 100644 (file)
--- a/src/test/crimson/seastore/test_seastore_journal.cc
+++ b/src/test/crimson/seastore/test_seastore_journal.cc
@@ -72,7 +72,7 @@ struct journal_test_t : seastar_test_suite_t, SegmentProvider, JournalTrimmer {
 
   std::default_random_engine generator;
 
-  seastore_off_t block_size;
+  extent_len_t block_size;
 
   SegmentManagerGroupRef sms;
 

diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h
index 73adbcfab475db347ee3379ddd988c1309a20080..0c45dcc61138c71e2a1057ac7b7f36c9ee27fe79 100644 (file)
--- a/src/test/crimson/seastore/transaction_manager_test_state.h
+++ b/src/test/crimson/seastore/transaction_manager_test_state.h
@@ -325,7 +325,7 @@ public:
   }
 
   size_t get_available_size() const final { return sm.get_available_size(); }
-  seastore_off_t get_block_size() const final { return sm.get_block_size(); }
+  extent_len_t get_block_size() const final { return sm.get_block_size(); }
   seastore_off_t get_segment_size() const final {
     return sm.get_segment_size();
   }