crimson/os/seastore/btree: change btree.update() into a synchronous

method

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index 8fe052412899f83819a078e5eea925574fb676e5..4c5b23c923816c9500f65aee09ec60ce5b81051e 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -970,9 +970,7 @@ public:
    * @param val [in] val with which to update
    * @return iterator to newly updated element
    */
-  using update_iertr = base_iertr;
-  using update_ret = update_iertr::future<iterator>;
-  update_ret update(
+  iterator update(
     op_context_t c,
     iterator iter,
     node_val_t val,
@@ -1000,9 +998,7 @@ public:
         iter.leaf.node->update_child_ptr(iter.leaf.pos, child);
       }
     }
-    return update_ret(
-      interruptible::ready_future_marker{},
-      iter);
+    return iter;
   }
 
 

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc
index 3696823088f68d202e0f9ecf7ce41b407309e8e0..f75cb6021998a123d692cb276e02b778b1a997f9 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -1063,7 +1063,7 @@ BtreeLBAManager::_update_mapping(
     );
     co_return iter.get_cursor(c);
   } else {
-    iter = co_await btree.update(
+    iter = btree.update(
       c,
       iter,
       ret,