import 15.2.0 Octopus source

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

diff --git a/ceph/src/librbd/journal/Utils.h b/ceph/src/librbd/journal/Utils.h
index 63d37c03726eebd8265749f5e18215ada354f029..93643f9f9ee24e0f92eca0c205c97ffd7b167689 100644 (file)
--- a/ceph/src/librbd/journal/Utils.h
+++ b/ceph/src/librbd/journal/Utils.h
@@ -4,13 +4,12 @@
 #ifndef CEPH_LIBRBD_JOURNAL_UTILS_H
 #define CEPH_LIBRBD_JOURNAL_UTILS_H
 
+#include "include/common_fwd.h"
 #include "include/int_types.h"
 #include "include/Context.h"
 #include "cls/journal/cls_journal_types.h"
 #include <list>
 
-struct CephContext;
-struct Mutex;
 
 namespace librbd {
 namespace journal {
@@ -21,14 +20,14 @@ namespace util {
 
 struct C_DecodeTag : public Context {
   CephContext *cct;
-  Mutex *lock;
+  ceph::mutex *lock;
   uint64_t *tag_tid;
   TagData *tag_data;
   Context *on_finish;
 
   cls::journal::Tag tag;
 
-  C_DecodeTag(CephContext *cct, Mutex *lock, uint64_t *tag_tid,
+  C_DecodeTag(CephContext *cct, ceph::mutex *lock, uint64_t *tag_tid,
               TagData *tag_data, Context *on_finish)
     : cct(cct), lock(lock), tag_tid(tag_tid), tag_data(tag_data),
       on_finish(on_finish) {
@@ -51,14 +50,14 @@ struct C_DecodeTags : public Context {
   typedef std::list<cls::journal::Tag> Tags;
 
   CephContext *cct;
-  Mutex *lock;
+  ceph::mutex *lock;
   uint64_t *tag_tid;
   TagData *tag_data;
   Context *on_finish;
 
   Tags tags;
 
-  C_DecodeTags(CephContext *cct, Mutex *lock, uint64_t *tag_tid,
+  C_DecodeTags(CephContext *cct, ceph::mutex *lock, uint64_t *tag_tid,
                TagData *tag_data, Context *on_finish)
     : cct(cct), lock(lock), tag_tid(tag_tid), tag_data(tag_data),
       on_finish(on_finish) {