import 15.2.0 Octopus source

[ceph.git] / ceph / src / journal / JournalTrimmer.h

diff --git a/ceph/src/journal/JournalTrimmer.h b/ceph/src/journal/JournalTrimmer.h
index 0b27923992d0d4f5d94662f20def4cda0e738a87..9c74961c9253d73216df16e38f63b86803333a9c 100644 (file)
--- a/ceph/src/journal/JournalTrimmer.h
+++ b/ceph/src/journal/JournalTrimmer.h
@@ -8,7 +8,6 @@
 #include "include/rados/librados.hpp"
 #include "include/Context.h"
 #include "common/AsyncOpTracker.h"
-#include "common/Mutex.h"
 #include "journal/JournalMetadata.h"
 #include "cls/journal/cls_journal_types.h"
 #include <functional>
@@ -22,7 +21,7 @@ public:
   typedef cls::journal::ObjectSetPosition ObjectSetPosition;
 
   JournalTrimmer(librados::IoCtx &ioctx, const std::string &object_oid_prefix,
-                 const JournalMetadataPtr &journal_metadata);
+                 const ceph::ref_t<JournalMetadata> &journal_metadata);
   ~JournalTrimmer();
 
   void shut_down(Context *on_finish);
@@ -65,12 +64,12 @@ private:
   CephContext *m_cct;
   std::string m_object_oid_prefix;
 
-  JournalMetadataPtr m_journal_metadata;
+  ceph::ref_t<JournalMetadata> m_journal_metadata;
   MetadataListener m_metadata_listener;
 
   AsyncOpTracker m_async_op_tracker;
 
-  Mutex m_lock;
+  ceph::mutex m_lock = ceph::make_mutex("JournalTrimmer::m_lock");
 
   bool m_remove_set_pending;
   uint64_t m_remove_set;