update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / persistent_cache / block_cache_tier_file.h

diff --git a/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h b/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h
index b7f820b06817c3c8366db7cc878539c8dd022fe5..95be4ec3cc6697393d15a15d48d30c1238d3f936 100644 (file)
--- a/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h
+++ b/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.h
@@ -11,6 +11,8 @@
 #include <string>
 #include <vector>
 
+#include "file/random_access_file_reader.h"
+
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"
 
@@ -21,7 +23,6 @@
 
 #include "port/port.h"
 #include "util/crc32c.h"
-#include "util/file_reader_writer.h"
 #include "util/mutexlock.h"
 
 // The io code path of persistent cache uses pipelined architecture
@@ -45,7 +46,7 @@
 //
 // Write IO code path :
 //
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class WriteableCacheFile;
 struct BlockInfo;
@@ -135,7 +136,7 @@ class BlockCacheFile : public LRUElement<BlockCacheFile> {
 
  protected:
   port::RWMutex rwlock_;               // synchronization mutex
-  Env* const env_ = nullptr;           // Env for IO
+  Env* const env_ = nullptr;           // Env for OS
   const std::string dir_;              // Directory name
   const uint32_t cache_id_;            // Cache id for the file
   std::list<BlockInfo*> block_infos_;  // List of index entries mapping to the
@@ -290,6 +291,6 @@ class ThreadedWriter : public Writer {
   std::vector<port::Thread> threads_;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 
 #endif