From: Samuel Just <sjust@redhat.com>
Date: Thu, 3 Jun 2021 21:51:43 +0000 (-0700)
Subject: crimson/os/seastore/cache: rename retire_extent_addr for addr overload
X-Git-Tag: v17.1.0~1567^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76e3eb75984f4d659f5dc21ae9d552ff31fe6678;p=ceph.git

crimson/os/seastore/cache: rename retire_extent_addr for addr overload

Makes InterruptibleCache bit in the later patch simpler, and is somewhat
clearer.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index 0793c7deb2963..2dc005628150a 100644
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -27,7 +27,7 @@ Cache::~Cache()
   ceph_assert(extents.empty());
 }
 
-Cache::retire_extent_ret Cache::retire_extent(
+Cache::retire_extent_ret Cache::retire_extent_addr(
   Transaction &t, paddr_t addr, extent_len_t length)
 {
   LOG_PREFIX(Cache::retire_extent);
diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index 0f3e260f3c143..57173ab94727e 100644
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -139,7 +139,7 @@ public:
   /// Declare paddr retired in t
   using retire_extent_ertr = base_ertr;
   using retire_extent_ret = retire_extent_ertr::future<>;
-  retire_extent_ret retire_extent(
+  retire_extent_ret retire_extent_addr(
     Transaction &t, paddr_t addr, extent_len_t length);
 
   /**
diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index 105d3f040928f..af5a8804c76fc 100644
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -173,7 +173,7 @@ TransactionManager::ref_ret TransactionManager::dec_ref(
   ).safe_then([this, FNAME, offset, &t](auto result) -> ref_ret {
     if (result.refcount == 0 && !result.addr.is_zero()) {
       DEBUGT("offset {} refcount 0", t, offset);
-      return cache->retire_extent(
+      return cache->retire_extent_addr(
 	t, result.addr, result.length
       ).safe_then([result, this] {
 	stats.extents_retired_total++;