From 00363a0f7c20a7f002b37eac93d88791e5bc2568 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 13 May 2021 13:11:57 +0200 Subject: [PATCH] librbd/cache/pwl/ssd: rename aio_read_data_block() overload Rename the overload that deals with multiple data blocks to aio_read_data_blocks(). Signed-off-by: Ilya Dryomov --- src/librbd/cache/pwl/ssd/WriteLog.cc | 6 +++--- src/librbd/cache/pwl/ssd/WriteLog.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc index 7a5a26e319ee3..6d8d81151d997 100644 --- a/src/librbd/cache/pwl/ssd/WriteLog.cc +++ b/src/librbd/cache/pwl/ssd/WriteLog.cc @@ -88,7 +88,7 @@ void WriteLog::complete_read( std::vector &bls_to_read, Context *ctx) { if (!log_entries_to_read.empty()) { - aio_read_data_block(log_entries_to_read, bls_to_read, ctx); + aio_read_data_blocks(log_entries_to_read, bls_to_read, ctx); } else { ctx->complete(0); } @@ -932,11 +932,11 @@ void WriteLog::aio_read_data_block(WriteLogCacheEntry *log_entry, bufferlist *bl, Context *ctx) { std::vector log_entries {log_entry}; std::vector bls {bl}; - aio_read_data_block(log_entries, bls, ctx); + aio_read_data_blocks(log_entries, bls, ctx); } template -void WriteLog::aio_read_data_block( +void WriteLog::aio_read_data_blocks( std::vector &log_entries, std::vector &bls, Context *ctx) { ceph_assert(log_entries.size() == bls.size()); diff --git a/src/librbd/cache/pwl/ssd/WriteLog.h b/src/librbd/cache/pwl/ssd/WriteLog.h index 2ad9466186317..1a7a5e7a11629 100644 --- a/src/librbd/cache/pwl/ssd/WriteLog.h +++ b/src/librbd/cache/pwl/ssd/WriteLog.h @@ -135,8 +135,8 @@ private: AioTransContext *aio); void aio_read_data_block(WriteLogCacheEntry *log_entry, bufferlist *bl, Context *ctx); - void aio_read_data_block(std::vector &log_entries, - std::vector &bls, Context *ctx); + void aio_read_data_blocks(std::vector &log_entries, + std::vector &bls, Context *ctx); static void aio_cache_cb(void *priv, void *priv2) { AioTransContext *c = static_cast(priv2); c->aio_finish(); -- 2.39.5