os/bluestore: remove internal structures from Bluestore.h

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 959a63cbb14a2e7d6fcb622c585562a74ac7b677..2ddc7c6583401c14aa979e44a39c224832d30d10 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -3561,6 +3561,30 @@ int BlueStore::read(
   return r;
 }
 
+// --------------------------------------------------------
+// intermediate data structures used while reading
+struct region_t {
+  uint64_t logical_offset;
+  uint64_t blob_xoffset;   //region offset within the blob
+  uint64_t length;
+
+  region_t(uint64_t offset, uint64_t b_offs, uint64_t len)
+    : logical_offset(offset),
+    blob_xoffset(b_offs),
+    length(len) {}
+  region_t(const region_t& from)
+    : logical_offset(from.logical_offset),
+    blob_xoffset(from.blob_xoffset),
+    length(from.length) {}
+
+  friend ostream& operator<<(ostream& out, const region_t& r) {
+    return out << "0x" << std::hex << r.logical_offset << ":"
+      << r.blob_xoffset << "~" << r.length << std::dec;
+  }
+};
+typedef list<region_t> regions2read_t;
+typedef map<Blob*, regions2read_t> blobs2read_t;
+
 int BlueStore::_do_read(
   Collection *c,
   OnodeRef o,

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 7352d6c9d5c4076d39665cc065e969f6dc535235..7213c6c1db6f56b18bd88235f1b34ff912691a83 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -82,29 +82,6 @@ public:
   class TransContext;
   class Blob;
 
-  // --------------------------------------------------------
-  // intermediate data structures used while reading
-  struct region_t {
-    uint64_t logical_offset;
-    uint64_t blob_xoffset;   //region offset within the blob
-    uint64_t length;
-
-    region_t(uint64_t offset, uint64_t b_offs, uint64_t len)
-      : logical_offset(offset),
-      blob_xoffset(b_offs),
-      length(len) {}
-    region_t(const region_t& from)
-      : logical_offset(from.logical_offset),
-      blob_xoffset(from.blob_xoffset),
-      length(from.length) {}
-
-    friend ostream& operator<<(ostream& out, const region_t& r) {
-      return out << "0x" << std::hex << r.logical_offset << ":"
-                << r.blob_xoffset << "~" << r.length << std::dec;
-    }
-  };
-  typedef list<region_t> regions2read_t;
-  typedef map<Blob*, regions2read_t> blobs2read_t;
   typedef map<uint64_t, bufferlist> ready_regions_t;
 
   struct BufferSpace;