From 820bbecfb130ad99483f0d468f1b1c9612e54935 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 12 May 2021 12:19:07 +0200 Subject: [PATCH] librbd/cache/pwl: get rid of AbstractWriteLog::m_log_pool_actual_size Signed-off-by: Ilya Dryomov --- src/librbd/cache/pwl/AbstractWriteLog.h | 1 - src/librbd/cache/pwl/rwl/WriteLog.cc | 5 ++--- src/librbd/cache/pwl/ssd/WriteLog.cc | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/librbd/cache/pwl/AbstractWriteLog.h b/src/librbd/cache/pwl/AbstractWriteLog.h index a368fdb8530..5602a6bb70a 100644 --- a/src/librbd/cache/pwl/AbstractWriteLog.h +++ b/src/librbd/cache/pwl/AbstractWriteLog.h @@ -264,7 +264,6 @@ protected: std::string m_log_pool_name; uint64_t m_log_pool_config_size; /* Configured size of RWL */ - uint64_t m_log_pool_actual_size = 0; /* Actual size of RWL pool */ uint32_t m_total_log_entries = 0; uint32_t m_free_log_entries = 0; diff --git a/src/librbd/cache/pwl/rwl/WriteLog.cc b/src/librbd/cache/pwl/rwl/WriteLog.cc index 19fb7497b38..056bc834a6c 100644 --- a/src/librbd/cache/pwl/rwl/WriteLog.cc +++ b/src/librbd/cache/pwl/rwl/WriteLog.cc @@ -294,7 +294,6 @@ bool WriteLog::initialize_pool(Context *on_finish, pwl::DeferredContexts &lat on_finish->complete(-EINVAL); return false; } - this->m_log_pool_actual_size = this->m_log_pool_config_size; this->m_bytes_allocated_cap = effective_pool_size; /* Log ring empty */ m_first_free_entry = 0; @@ -305,7 +304,7 @@ bool WriteLog::initialize_pool(Context *on_finish, pwl::DeferredContexts &lat D_RW(pool_root)->log_entries = TX_ZALLOC(struct WriteLogCacheEntry, sizeof(struct WriteLogCacheEntry) * num_small_writes); - D_RW(pool_root)->pool_size = this->m_log_pool_actual_size; + D_RW(pool_root)->pool_size = this->m_log_pool_config_size; D_RW(pool_root)->flushed_sync_gen = this->m_flushed_sync_gen; D_RW(pool_root)->block_size = MIN_WRITE_ALLOC_SIZE; D_RW(pool_root)->num_log_entries = num_small_writes; @@ -348,7 +347,7 @@ bool WriteLog::initialize_pool(Context *on_finish, pwl::DeferredContexts &lat on_finish->complete(-EINVAL); return false; } - this->m_log_pool_actual_size = D_RO(pool_root)->pool_size; + this->m_log_pool_config_size = D_RO(pool_root)->pool_size; this->m_flushed_sync_gen = D_RO(pool_root)->flushed_sync_gen; this->m_total_log_entries = D_RO(pool_root)->num_log_entries; m_first_free_entry = D_RO(pool_root)->first_free_entry; diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc index 094b74569c3..c772c703ba4 100644 --- a/src/librbd/cache/pwl/ssd/WriteLog.cc +++ b/src/librbd/cache/pwl/ssd/WriteLog.cc @@ -243,7 +243,7 @@ void WriteLog::load_existing_entries(pwl::DeferredContexts &later) { m_first_valid_entry = next_log_pos; this->m_total_log_entries = current_pool_root.num_log_entries; this->m_flushed_sync_gen = current_pool_root.flushed_sync_gen; - this->m_log_pool_actual_size = current_pool_root.pool_size; + this->m_log_pool_config_size = current_pool_root.pool_size; std::map> sync_point_entries; @@ -276,8 +276,8 @@ void WriteLog::load_existing_entries(pwl::DeferredContexts &later) { } // along with the write_bytes, add control block size too next_log_pos += MIN_WRITE_ALLOC_SSD_SIZE; - if (next_log_pos >= this->m_log_pool_actual_size) { - next_log_pos = next_log_pos % this->m_log_pool_actual_size + DATA_RING_BUFFER_OFFSET; + if (next_log_pos >= this->m_log_pool_config_size) { + next_log_pos = next_log_pos % this->m_log_pool_config_size + DATA_RING_BUFFER_OFFSET; } } this->update_sync_points(missing_sync_points, sync_point_entries, later, -- 2.39.5