update ceph source to reef 18.2.1

[ceph.git] / ceph / src / crimson / os / seastore / seastore_types.cc

diff --git a/ceph/src/crimson/os/seastore/seastore_types.cc b/ceph/src/crimson/os/seastore/seastore_types.cc
index 9328a03094c561b736f2f2c7912b8a6656e5a79f..0acfdb74ebb54d21d3c06abf217cea510f8c6210 100644 (file)
--- a/ceph/src/crimson/os/seastore/seastore_types.cc
+++ b/ceph/src/crimson/os/seastore/seastore_types.cc
@@ -89,6 +89,15 @@ std::ostream& operator<<(std::ostream& out, segment_seq_printer_t seq)
   }
 }
 
+std::ostream &operator<<(std::ostream &out, const pladdr_t &pladdr)
+{
+  if (pladdr.is_laddr()) {
+    return out << pladdr.get_laddr();
+  } else {
+    return out << pladdr.get_paddr();
+  }
+}
+
 std::ostream &operator<<(std::ostream &out, const paddr_t &rhs)
 {
   auto id = rhs.get_device_id();
@@ -779,8 +788,8 @@ device_type_t string_to_device_type(std::string type) {
   if (type == "SSD") {
     return device_type_t::SSD;
   }
-  if (type == "ZNS") {
-    return device_type_t::ZNS;
+  if (type == "ZBD") {
+    return device_type_t::ZBD;
   }
   if (type == "RANDOM_BLOCK_SSD") {
     return device_type_t::RANDOM_BLOCK_SSD;
@@ -797,8 +806,8 @@ std::ostream& operator<<(std::ostream& out, device_type_t t)
     return out << "HDD";
   case device_type_t::SSD:
     return out << "SSD";
-  case device_type_t::ZNS:
-    return out << "ZNS";
+  case device_type_t::ZBD:
+    return out << "ZBD";
   case device_type_t::EPHEMERAL_COLD:
     return out << "EPHEMERAL_COLD";
   case device_type_t::EPHEMERAL_MAIN: