update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / os / filestore / JournalingObjectStore.h

diff --git a/ceph/src/os/filestore/JournalingObjectStore.h b/ceph/src/os/filestore/JournalingObjectStore.h
index 17dc2abd7fc6a0459afd54493cea39ee07a35ba4..a289d0e86c6137982ac7842d0c9af74659f86886 100644 (file)
--- a/ceph/src/os/filestore/JournalingObjectStore.h
+++ b/ceph/src/os/filestore/JournalingObjectStore.h
@@ -34,7 +34,7 @@ protected:
     uint64_t op_submitted;
   public:
     SubmitManager(CephContext* cct) :
-      cct(cct), lock("JOS::SubmitManager::lock", false, true, false, cct),
+      cct(cct), lock("JOS::SubmitManager::lock", false, true, false),
       op_seq(0), op_submitted(0)
     {}
     uint64_t op_submit_start();
@@ -66,15 +66,15 @@ protected:
   public:
     ApplyManager(CephContext* cct, Journal *&j, Finisher &f) :
       cct(cct), journal(j), finisher(f),
-      apply_lock("JOS::ApplyManager::apply_lock", false, true, false, cct),
+      apply_lock("JOS::ApplyManager::apply_lock", false, true, false),
       blocked(false),
       open_ops(0),
       max_applied_seq(0),
-      com_lock("JOS::ApplyManager::com_lock", false, true, false, cct),
+      com_lock("JOS::ApplyManager::com_lock", false, true, false),
       committing_seq(0), committed_seq(0) {}
     void reset() {
-      assert(open_ops == 0);
-      assert(blocked == false);
+      ceph_assert(open_ops == 0);
+      ceph_assert(blocked == false);
       max_applied_seq = 0;
       committing_seq = 0;
       committed_seq = 0;