From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Thu, 27 Jan 2022 15:30:54 +0000 (+0800)
Subject: crimson/os/seastore: update_mapping related cleanups
X-Git-Tag: v18.0.0~1401^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cc67f3262dc810104b4eecec920cf608bb495736;p=ceph-ci.git

crimson/os/seastore: update_mapping related cleanups

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h
index 69aa0954a9c..fe0a5fa331b 100644
--- a/src/crimson/os/seastore/lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager.h
@@ -164,13 +164,13 @@ public:
     CachedExtentRef extent) = 0;
 
   /**
-   * delayed_update_mapping
+   * update_mapping
    *
-   * update lba mapping for delayed allocated extents
+   * update lba mapping for a delayed allocated extent
    */
-  using update_le_mapping_iertr = base_iertr;
-  using update_le_mapping_ret = base_iertr::future<>;
-  virtual update_le_mapping_ret update_mapping(
+  using update_mapping_iertr = base_iertr;
+  using update_mapping_ret = base_iertr::future<>;
+  virtual update_mapping_ret update_mapping(
     Transaction& t,
     laddr_t laddr,
     paddr_t prev_addr,
diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
index dec4254344a..d3872b42eb0 100644
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
@@ -386,7 +386,7 @@ BtreeLBAManager::rewrite_extent_ret BtreeLBAManager::rewrite_extent(
   }
 }
 
-BtreeLBAManager::update_le_mapping_ret
+BtreeLBAManager::update_mapping_ret
 BtreeLBAManager::update_mapping(
   Transaction& t,
   laddr_t laddr,
@@ -395,7 +395,7 @@ BtreeLBAManager::update_mapping(
 {
   LOG_PREFIX(BtreeLBAManager::update_mapping);
   TRACET("laddr={}, paddr {} => {}", t, laddr, prev_addr, addr);
-  return update_mapping(
+  return _update_mapping(
     t,
     laddr,
     [prev_addr, addr](
@@ -410,10 +410,10 @@ BtreeLBAManager::update_mapping(
       DEBUGT("laddr={}, paddr {} => {} done -- {}",
              t, laddr, prev_addr, addr, result);
     },
-    update_le_mapping_iertr::pass_further{},
+    update_mapping_iertr::pass_further{},
     /* ENOENT in particular should be impossible */
     crimson::ct_error::assert_all{
-      "Invalid error in BtreeLBAManager::rewrite_extent after update_mapping"
+      "Invalid error in BtreeLBAManager::update_mapping"
     }
   );
 }
@@ -482,7 +482,7 @@ BtreeLBAManager::update_refcount_ret BtreeLBAManager::update_refcount(
 {
   LOG_PREFIX(BtreeLBAManager::update_refcount);
   TRACET("laddr={}, delta={}", t, addr, delta);
-  return update_mapping(
+  return _update_mapping(
     t,
     addr,
     [delta](const lba_map_val_t &in) {
@@ -501,7 +501,7 @@ BtreeLBAManager::update_refcount_ret BtreeLBAManager::update_refcount(
   });
 }
 
-BtreeLBAManager::update_mapping_ret BtreeLBAManager::update_mapping(
+BtreeLBAManager::_update_mapping_ret BtreeLBAManager::_update_mapping(
   Transaction &t,
   laddr_t addr,
   update_func_t &&f)
@@ -513,9 +513,9 @@ BtreeLBAManager::update_mapping_ret BtreeLBAManager::update_mapping(
       return btree.lower_bound(
 	c, addr
       ).si_then([&btree, f=std::move(f), c, addr](auto iter)
-		-> update_mapping_ret {
+		-> _update_mapping_ret {
 	if (iter.is_end() || iter.get_key() != addr) {
-	  LOG_PREFIX(BtreeLBAManager::update_mapping);
+	  LOG_PREFIX(BtreeLBAManager::_update_mapping);
 	  DEBUGT("laddr={} doesn't exist", c.trans, addr);
 	  return crimson::ct_error::enoent::make();
 	}
diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
index b6443f9f28e..b02a84949e0 100644
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
@@ -102,7 +102,7 @@ public:
     Transaction &t,
     CachedExtentRef extent) final;
 
-  update_le_mapping_ret update_mapping(
+  update_mapping_ret update_mapping(
     Transaction& t,
     laddr_t laddr,
     paddr_t prev_addr,
@@ -217,16 +217,16 @@ private:
     int delta);
 
   /**
-   * update_mapping
+   * _update_mapping
    *
    * Updates mapping, removes if f returns nullopt
    */
-  using update_mapping_iertr = ref_iertr;
-  using update_mapping_ret = ref_iertr::future<lba_map_val_t>;
+  using _update_mapping_iertr = ref_iertr;
+  using _update_mapping_ret = ref_iertr::future<lba_map_val_t>;
   using update_func_t = std::function<
     lba_map_val_t(const lba_map_val_t &v)
     >;
-  update_mapping_ret update_mapping(
+  _update_mapping_ret _update_mapping(
     Transaction &t,
     laddr_t addr,
     update_func_t &&f);