import ceph quincy 17.2.6

[ceph.git] / ceph / src / mds / MDLog.h

diff --git a/ceph/src/mds/MDLog.h b/ceph/src/mds/MDLog.h
index 6111f85a97f97bea5a221ca429954cd23f5a4e46..b42fa5dd7159445dd9637096ab1b0d1af2e1bab4 100644 (file)
--- a/ceph/src/mds/MDLog.h
+++ b/ceph/src/mds/MDLog.h
@@ -14,6 +14,7 @@
 #ifndef CEPH_MDLOG_H
 #define CEPH_MDLOG_H
 
+#include "common/fair_mutex.h"
 #include "include/common_fwd.h"
 
 enum {
@@ -285,8 +286,8 @@ protected:
 
   int64_t mdsmap_up_features = 0;
   std::map<uint64_t,std::list<PendingEvent> > pending_events; // log segment -> event list
-  ceph::mutex submit_mutex = ceph::make_mutex("MDLog::submit_mutex");
-  ceph::condition_variable submit_cond;
+  ceph::fair_mutex submit_mutex{"MDLog::submit_mutex"};
+  std::condition_variable_any submit_cond;
 
 private:
   friend class C_MaybeExpiredSegment;