From cc9ab96a595d7316ae0fb9b81d17b176d0de5da8 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Wed, 16 Nov 2022 12:04:09 +0900 Subject: [PATCH] crimson/os/seastore/rbm: remove unused code and out-dated comment Signed-off-by: Myoungwon Oh --- src/crimson/os/seastore/random_block_manager.h | 6 ------ .../seastore/random_block_manager/block_rb_manager.cc | 10 ---------- .../seastore/random_block_manager/block_rb_manager.h | 6 ------ 3 files changed, 22 deletions(-) diff --git a/src/crimson/os/seastore/random_block_manager.h b/src/crimson/os/seastore/random_block_manager.h index 1e11abdae7e..625fcb8bb34 100644 --- a/src/crimson/os/seastore/random_block_manager.h +++ b/src/crimson/os/seastore/random_block_manager.h @@ -95,12 +95,6 @@ public: virtual void mark_space_used(paddr_t paddr, size_t len) = 0; virtual void mark_space_free(paddr_t paddr, size_t len) = 0; - using abort_allocation_ertr = crimson::errorator< - crimson::ct_error::input_output_error, - crimson::ct_error::invarg - >; - virtual abort_allocation_ertr::future<> abort_allocation(Transaction &t) = 0; - virtual void complete_allocation(paddr_t addr, size_t size) = 0; virtual size_t get_size() const = 0; 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 78bacf28763..e06f2d62622 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 @@ -62,16 +62,6 @@ paddr_t BlockRBManager::alloc_extent(size_t size) return paddr; } - -BlockRBManager::abort_allocation_ertr::future<> BlockRBManager::abort_allocation( - Transaction &t) -{ - /* - * TODO: clear all allocation infos associated with transaction in in-memory allocator - */ - return abort_allocation_ertr::now(); -} - void BlockRBManager::complete_allocation( paddr_t paddr, size_t size) { 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 3bfc78dce60..ab57589b58a 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 @@ -59,7 +59,6 @@ public: */ paddr_t alloc_extent(size_t size) final; // allocator, return blocks - abort_allocation_ertr::future<> abort_allocation(Transaction &t) final; void complete_allocation(paddr_t addr, size_t size) final; size_t get_start_rbm_addr() const { @@ -70,11 +69,6 @@ public: }; extent_len_t get_block_size() const final { return device->get_block_size(); } - /* - * We will have mulitple partitions (circularjournals and randbomblockmanagers) - * on a device, so start and end location of the device are needed to - * support such case. - */ BlockRBManager(RBMDevice * device, std::string path, bool detailed) : device(device), path(path) { allocator.reset(new AvlAllocator(detailed)); -- 2.39.5