import 15.2.0 Octopus source

[ceph.git] / ceph / src / librbd / journal / OpenRequest.h

diff --git a/ceph/src/librbd/journal/OpenRequest.h b/ceph/src/librbd/journal/OpenRequest.h
index f71d8c536768870e1aaf79124ecf1101e82316b2..0f10bccf1ade46d5319f40354928f65e338d42a6 100644 (file)
--- a/ceph/src/librbd/journal/OpenRequest.h
+++ b/ceph/src/librbd/journal/OpenRequest.h
@@ -4,11 +4,11 @@
 #ifndef CEPH_LIBRBD_JOURNAL_OPEN_REQUEST_H
 #define CEPH_LIBRBD_JOURNAL_OPEN_REQUEST_H
 
+#include "common/ceph_mutex.h"
 #include "include/int_types.h"
 #include "librbd/journal/TypeTraits.h"
 
 struct Context;
-struct Mutex;
 
 namespace librbd {
 
@@ -25,14 +25,14 @@ public:
   typedef typename TypeTraits<ImageCtxT>::Journaler Journaler;
 
   static OpenRequest* create(ImageCtxT *image_ctx, Journaler *journaler,
-                             Mutex *lock, journal::ImageClientMeta *client_meta,
+                             ceph::mutex *lock, journal::ImageClientMeta *client_meta,
                              uint64_t *tag_tid, journal::TagData *tag_data,
                              Context *on_finish) {
     return new OpenRequest(image_ctx, journaler, lock, client_meta, tag_tid,
                            tag_data, on_finish);
   }
 
-  OpenRequest(ImageCtxT *image_ctx, Journaler *journaler, Mutex *lock,
+  OpenRequest(ImageCtxT *image_ctx, Journaler *journaler, ceph::mutex *lock,
               journal::ImageClientMeta *client_meta, uint64_t *tag_tid,
               journal::TagData *tag_data, Context *on_finish);
 
@@ -59,7 +59,7 @@ private:
 
   ImageCtxT *m_image_ctx;
   Journaler *m_journaler;
-  Mutex *m_lock;
+  ceph::mutex *m_lock;
   journal::ImageClientMeta *m_client_meta;
   uint64_t *m_tag_tid;
   journal::TagData *m_tag_data;