From 13de6c0c125a7237a5805da3dcf856ef7ec4ab50 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Wed, 28 Feb 2024 18:26:24 +0800 Subject: [PATCH] crimson/os/seastore/cache: drop unnecessary friend declarations Signed-off-by: Xuehan Xu (cherry picked from commit fecf501c41471e132427f2a40f26298a38ba4003) --- src/crimson/os/seastore/btree/fixed_kv_btree.h | 2 +- src/crimson/os/seastore/cached_extent.h | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h index c1af9c95d09be..db6672c74c178 100644 --- a/src/crimson/os/seastore/btree/fixed_kv_btree.h +++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h @@ -533,7 +533,7 @@ public: } } else if (child_node->is_pending()) { if (child_node->is_mutation_pending()) { - auto &prior = (child_node_t &)*child_node->prior_instance; + auto &prior = (child_node_t &)*child_node->get_prior_instance(); assert(prior.is_valid()); assert(prior.is_parent_valid()); if (node->is_mutation_pending()) { diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h index 9643cbe6cc7db..e259a24a79f6f 100644 --- a/src/crimson/os/seastore/cached_extent.h +++ b/src/crimson/os/seastore/cached_extent.h @@ -30,15 +30,6 @@ class SegmentedAllocator; class TransactionManager; class ExtentPlacementManager; -template < - typename node_key_t, - typename node_val_t, - typename internal_node_t, - typename leaf_node_t, - typename pin_t, - size_t node_size, - bool leaf_has_children> -class FixedKVBtree; template class BtreeNodeMapping; @@ -192,15 +183,6 @@ class CachedExtent friend class onode::DummyNodeExtent; friend class onode::TestReplayExtent; - template < - typename node_key_t, - typename node_val_t, - typename internal_node_t, - typename leaf_node_t, - typename pin_t, - size_t node_size, - bool leaf_has_children> - friend class FixedKVBtree; uint32_t last_committed_crc = 0; // Points at current version while in state MUTATION_PENDING -- 2.39.5