import 14.2.4 nautilus point release

[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 ef5dbab0408596eeb9697b5a3c9bb1d8fcb04fb9..b7f820b06817c3c8366db7cc878539c8dd022fe5 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
@@ -149,7 +149,7 @@ class RandomAccessCacheFile : public BlockCacheFile {
  public:
   explicit RandomAccessCacheFile(Env* const env, const std::string& dir,
                                  const uint32_t cache_id,
-                                 const shared_ptr<Logger>& log)
+                                 const std::shared_ptr<Logger>& log)
       : BlockCacheFile(env, dir, cache_id), log_(log) {}
 
   virtual ~RandomAccessCacheFile() {}
@@ -265,11 +265,11 @@ class ThreadedWriter : public Writer {
     IO& operator=(const IO&) = default;
     size_t Size() const { return sizeof(IO); }
 
-    WritableFile* file_ = nullptr;           // File to write to
-    CacheWriteBuffer* const buf_ = nullptr;  // buffer to write
-    uint64_t file_off_ = 0;                  // file offset
-    bool signal_ = false;                    // signal to exit thread loop
-    std::function<void()> callback_;         // Callback on completion
+    WritableFile* file_ = nullptr;     // File to write to
+    CacheWriteBuffer* buf_ = nullptr;  // buffer to write
+    uint64_t file_off_ = 0;            // file offset
+    bool signal_ = false;              // signal to exit thread loop
+    std::function<void()> callback_;   // Callback on completion
   };
 
   explicit ThreadedWriter(PersistentCacheTier* const cache, const size_t qdepth,