From afeaf166a5f26f4b05f9cc4bac30c880a9c938b4 Mon Sep 17 00:00:00 2001
From: myoungwon oh <ohmyoungwon@gmail.com>
Date: Fri, 14 Oct 2022 17:45:50 +0900
Subject: [PATCH] crimson/os/seastore/rbm: remove start and start_data_area

remove start and start_data_area in rbm header and
use RBM_START_ADDRESS and journal_size instead.

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
---
 src/crimson/os/seastore/random_block_manager.h         | 10 ++++------
 .../seastore/random_block_manager/block_rb_manager.cc  |  5 ++---
 .../seastore/random_block_manager/block_rb_manager.h   |  2 --
 .../seastore/random_block_manager/nvme_block_device.cc |  3 +--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/crimson/os/seastore/random_block_manager.h b/src/crimson/os/seastore/random_block_manager.h
index 718edfb5994..88d1be3707d 100644
--- a/src/crimson/os/seastore/random_block_manager.h
+++ b/src/crimson/os/seastore/random_block_manager.h
@@ -25,9 +25,8 @@ namespace crimson::os::seastore {
 struct rbm_metadata_header_t {
   size_t size = 0;
   size_t block_size = 0;
-  uint64_t start = 0; // start location of the device
   uint64_t feature = 0;
-  uint32_t start_data_area = 0;
+  uint64_t journal_size = 0;
   checksum_t crc = 0;
   device_config_t config;
 
@@ -35,10 +34,9 @@ struct rbm_metadata_header_t {
     DENC_START(1, 1, p);
     denc(v.size, p);
     denc(v.block_size, p);
-    denc(v.start, p);
     denc(v.feature, p);
 
-    denc(v.start_data_area, p);
+    denc(v.journal_size, p);
     denc(v.crc, p);
     denc(v.config, p);
     DENC_FINISH(p);
@@ -47,6 +45,8 @@ struct rbm_metadata_header_t {
 };
 
 class Device;
+using rbm_abs_addr = uint64_t;
+constexpr rbm_abs_addr RBM_START_ADDRESS = 0;
 class RandomBlockManager {
 public:
 
@@ -107,8 +107,6 @@ public:
   virtual ~RandomBlockManager() {}
 };
 using RandomBlockManagerRef = std::unique_ptr<RandomBlockManager>;
-using blk_no_t = uint64_t;
-using rbm_abs_addr = uint64_t;
 
 inline rbm_abs_addr convert_paddr_to_abs_addr(const paddr_t& paddr) {
   const blk_paddr_t& blk_addr = paddr.as_blk_paddr();
diff --git a/src/crimson/os/seastore/random_block_manager/block_rb_manager.cc b/src/crimson/os/seastore/random_block_manager/block_rb_manager.cc
index 2e8754bfd41..65af58d01f1 100644
--- a/src/crimson/os/seastore/random_block_manager/block_rb_manager.cc
+++ b/src/crimson/os/seastore/random_block_manager/block_rb_manager.cc
@@ -85,7 +85,7 @@ BlockRBManager::write_ertr::future<> BlockRBManager::complete_allocation(
 BlockRBManager::open_ertr::future<> BlockRBManager::open()
 {
   return device->read_rbm_header(RBM_START_ADDRESS
-  ).safe_then([&](auto s)
+  ).safe_then([](auto s)
     -> open_ertr::future<> {
     return open_ertr::now();
   }).handle_error(
@@ -165,9 +165,8 @@ std::ostream &operator<<(std::ostream &out, const rbm_metadata_header_t &header)
 {
   out << " rbm_metadata_header_t(size=" << header.size
        << ", block_size=" << header.block_size
-       << ", start=" << header.start
-       << ", start_data_area=" << header.start_data_area
        << ", feature=" << header.feature
+       << ", journal_size=" << header.journal_size
        << ", crc=" << header.crc
        << ", config=" << header.config;
   return out << ")";
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 fb208c21573..4059cbf2270 100644
--- a/src/crimson/os/seastore/random_block_manager/block_rb_manager.h
+++ b/src/crimson/os/seastore/random_block_manager/block_rb_manager.h
@@ -25,8 +25,6 @@
 
 namespace crimson::os::seastore {
 
-constexpr rbm_abs_addr RBM_START_ADDRESS = 0;
-
 using RBMDevice = random_block_device::RBMDevice;
 using RBMDeviceRef = std::unique_ptr<RBMDevice>;
 
diff --git a/src/crimson/os/seastore/random_block_manager/nvme_block_device.cc b/src/crimson/os/seastore/random_block_manager/nvme_block_device.cc
index 7a5ae18ce05..06775ec7e23 100644
--- a/src/crimson/os/seastore/random_block_manager/nvme_block_device.cc
+++ b/src/crimson/os/seastore/random_block_manager/nvme_block_device.cc
@@ -31,7 +31,6 @@ RBMDevice::mkfs_ret RBMDevice::mkfs(device_config_t config) {
   super.block_size = get_block_size();
   super.size = get_available_size();
 
-  super.start_data_area = 0;
   super.feature |= RBM_BITMAP_BLOCK_CRC;
   super.config = std::move(config);
   DEBUG("super {} ", super);
@@ -67,7 +66,7 @@ write_ertr::future<> RBMDevice::write_rbm_header()
   assert(bl.length() < super.block_size);
   iter.copy(bl.length(), bp.c_str());
 
-  return write(super.start, bp);
+  return write(RBM_START_ADDRESS, bp);
 }
 
 read_ertr::future<rbm_metadata_header_t> RBMDevice::read_rbm_header(
-- 
2.39.5