Revert "crimson/os/seastore/lba_mapping: don't allow classes above"

This reverts commit 45726996d65ec07b2c35a420c3ee0e42f0bf6cb4.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/os/seastore/lba_mapping.h b/src/crimson/os/seastore/lba_mapping.h
index 9c81a92808ab5d58d0d46bcdcbefbce9041fe848..92706ab90373369e86ca018779d7a68d13ebef7d 100644 (file)
--- a/src/crimson/os/seastore/lba_mapping.h
+++ b/src/crimson/os/seastore/lba_mapping.h
@@ -8,14 +8,6 @@
 #include "crimson/os/seastore/lba/lba_btree_node.h"
 #include "crimson/os/seastore/logical_child_node.h"
 
-class transaction_manager_test_t;
-class btree_lba_manager_test;
-class tm_single_device_intergrity_check_test_t;
-class tm_single_device_test_t;
-class tm_multi_device_test_t;
-class tm_multi_tier_device_test_t;
-class tm_random_block_device_test_t;
-
 namespace crimson::os::seastore {
 
 namespace lba {
@@ -134,6 +126,12 @@ public:
     return direct_cursor->get_length();
   }
 
+  paddr_t get_val() const {
+    assert(is_linked_direct());
+    assert(!direct_cursor->is_end());
+    return direct_cursor->get_paddr();
+  }
+
   checksum_t get_checksum() const {
     assert(is_linked_direct());
     assert(!direct_cursor->is_end());
@@ -199,21 +197,8 @@ public:
 private:
   friend lba::BtreeLBAManager;
   friend class TransactionManager;
-  friend class ::transaction_manager_test_t;
-  friend class ::btree_lba_manager_test;
-  friend class ::tm_single_device_intergrity_check_test_t;
-  friend class ::tm_single_device_test_t;
-  friend class ::tm_multi_device_test_t;
-  friend class ::tm_multi_tier_device_test_t;
-  friend class ::tm_random_block_device_test_t;
   friend std::ostream &operator<<(std::ostream&, const LBAMapping&);
 
-  paddr_t get_val() const {
-    assert(is_linked_direct());
-    assert(!direct_cursor->is_end());
-    return direct_cursor->get_paddr();
-  }
-
   LBACursor& get_effective_cursor() {
     if (is_indirect()) {
       return *indirect_cursor;

diff --git a/src/crimson/os/seastore/object_data_handler.cc b/src/crimson/os/seastore/object_data_handler.cc
index 680cb0f5f17bf66ba5058bacf513019d782e5545..828d4a94b4c9da47b03c303a6a7835b4b782b6fb 100644 (file)
--- a/src/crimson/os/seastore/object_data_handler.cc
+++ b/src/crimson/os/seastore/object_data_handler.cc
@@ -1496,7 +1496,7 @@ ObjectDataHandler::read_ret ObjectDataHandler::read(
             extent_len_t read_len =
               l_current_end.get_byte_distance<extent_len_t>(l_current);
 
-            if (pin.is_zero_reserved()) {
+            if (pin.get_val().is_zero()) {
               DEBUGT("got {}~0x{:x} from zero-pin {}~0x{:x}",
                 ctx.t,
                 l_current,
@@ -1598,7 +1598,7 @@ ObjectDataHandler::fiemap_ret ObjectDataHandler::fiemap(
        ceph_assert(pins.size() >= 1);
         ceph_assert(pins.front().get_key() <= l_start);
        for (auto &&i: pins) {
-         if (!i.is_zero_reserved()) {
+         if (!(i.get_val().is_zero())) {
            laddr_offset_t ret_left = std::max(laddr_offset_t(i.get_key(), 0), l_start);
            laddr_offset_t ret_right = std::min(
              i.get_key() + i.get_length(),