import ceph quincy 17.2.1

[ceph.git] / ceph / src / rgw / rgw_log.h

diff --git a/ceph/src/rgw/rgw_log.h b/ceph/src/rgw/rgw_log.h
index 3495ef086290dd8e786694d5fd1ca3f37ff413c2..7bcb62b18579cb90791f8fa61cd1b877c114f467 100644 (file)
--- a/ceph/src/rgw/rgw_log.h
+++ b/ceph/src/rgw/rgw_log.h
@@ -165,11 +165,10 @@ public:
 
 class OpsLogFile : public JsonOpsLogSink, public Thread, public DoutPrefixProvider {
   CephContext* cct;
-  ceph::mutex log_mutex = ceph::make_mutex("OpsLogFile_log");
-  ceph::mutex flush_mutex = ceph::make_mutex("OpsLogFile_flush");
+  ceph::mutex mutex = ceph::make_mutex("OpsLogFile");
   std::vector<bufferlist> log_buffer;
   std::vector<bufferlist> flush_buffer;
-  ceph::condition_variable cond_flush;
+  ceph::condition_variable cond;
   std::ofstream file;
   bool stopped;
   uint64_t data_size;