summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormyoungwon oh <ohmyoungwon@gmail.com>2021-11-22 12:30:58 +0900
committermyoungwon oh <ohmyoungwon@gmail.com>2022-01-19 01:32:28 +0900
commitd6f3a29da9024641c225c51fb414031b1477d897 (patch)
tree3ab3b32fe13809d28c025c36012ac97cfda4b56d
parent2745fd1ab138b255b4a060183739de3703f02658 (diff)
downloadceph-d6f3a29da9024641c225c51fb414031b1477d897.tar.gz
seatore/random_block_manager: remove blocks_per_segment
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
-rw-r--r--src/crimson/os/seastore/random_block_manager.h2
-rw-r--r--src/crimson/os/seastore/random_block_manager/nvme_manager.cc1
-rw-r--r--src/crimson/os/seastore/random_block_manager/nvme_manager.h5
3 files changed, 0 insertions, 8 deletions
diff --git a/src/crimson/os/seastore/random_block_manager.h b/src/crimson/os/seastore/random_block_manager.h
index 05d90205a89..d7ac73d0ec9 100644
--- a/src/crimson/os/seastore/random_block_manager.h
+++ b/src/crimson/os/seastore/random_block_manager.h
@@ -32,7 +32,6 @@ public:
paddr_t end;
size_t block_size = 0;
size_t total_size = 0;
- uint32_t blocks_per_segment = 1 << 18;
device_id_t device_id = 0;
seastore_meta_t meta;
};
@@ -95,7 +94,6 @@ public:
virtual size_t get_size() const = 0;
virtual size_t get_block_size() const = 0;
virtual uint64_t get_free_blocks() const = 0;
- virtual uint32_t get_blocks_per_segment() const = 0;
virtual device_id_t get_device_id() const = 0;
virtual ~RandomBlockManager() {}
};
diff --git a/src/crimson/os/seastore/random_block_manager/nvme_manager.cc b/src/crimson/os/seastore/random_block_manager/nvme_manager.cc
index ef5eca19cc9..577dc0394de 100644
--- a/src/crimson/os/seastore/random_block_manager/nvme_manager.cc
+++ b/src/crimson/os/seastore/random_block_manager/nvme_manager.cc
@@ -145,7 +145,6 @@ NVMeManager::mkfs_ertr::future<> NVMeManager::mkfs(mkfs_config_t config)
super.start_alloc_area + super.alloc_area_size;
super.crc = 0;
super.feature |= RBM_BITMAP_BLOCK_CRC;
- super.blocks_per_segment = config.blocks_per_segment;
super.device_id = config.device_id;
logger().debug(" super {} ", super);
diff --git a/src/crimson/os/seastore/random_block_manager/nvme_manager.h b/src/crimson/os/seastore/random_block_manager/nvme_manager.h
index f0f500c72be..07313b2bacc 100644
--- a/src/crimson/os/seastore/random_block_manager/nvme_manager.h
+++ b/src/crimson/os/seastore/random_block_manager/nvme_manager.h
@@ -54,7 +54,6 @@ struct rbm_metadata_header_t {
uint32_t start_data_area;
uint64_t flag; // reserved
uint64_t feature;
- uint32_t blocks_per_segment; // the number of blocks in segment
device_id_t device_id;
checksum_t crc;
@@ -72,7 +71,6 @@ struct rbm_metadata_header_t {
denc(v.start_data_area, p);
denc(v.flag, p);
denc(v.feature, p);
- denc(v.blocks_per_segment, p);
denc(v.device_id, p);
denc(v.crc, p);
@@ -361,9 +359,6 @@ public:
void add_free_extent(
std::vector<rbm_alloc_delta_t>& v, rbm_abs_addr from, size_t len);
- uint32_t get_blocks_per_segment() const final {
- return super.blocks_per_segment;
- }
device_id_t get_device_id() const final {
return super.device_id;
}