import 15.2.0 Octopus source

[ceph.git] / ceph / src / librbd / watcher / RewatchRequest.h

diff --git a/ceph/src/librbd/watcher/RewatchRequest.h b/ceph/src/librbd/watcher/RewatchRequest.h
index d4fc250abec7ebd39d284a2bb5cac0d13a88fe15..ce5e31539e4221a4aba205846c88a400e1c7da09 100644 (file)
--- a/ceph/src/librbd/watcher/RewatchRequest.h
+++ b/ceph/src/librbd/watcher/RewatchRequest.h
@@ -4,11 +4,11 @@
 #ifndef CEPH_LIBRBD_WATCHER_REWATCH_REQUEST_H
 #define CEPH_LIBRBD_WATCHER_REWATCH_REQUEST_H
 
+#include "common/ceph_mutex.h"
 #include "include/int_types.h"
 #include "include/rados/librados.hpp"
 
 struct Context;
-struct RWLock;
 
 namespace librbd {
 
@@ -18,7 +18,7 @@ class RewatchRequest {
 public:
 
   static RewatchRequest *create(librados::IoCtx& ioctx, const std::string& oid,
-                                RWLock &watch_lock,
+                                ceph::shared_mutex &watch_lock,
                                 librados::WatchCtx2 *watch_ctx,
                                 uint64_t *watch_handle, Context *on_finish) {
     return new RewatchRequest(ioctx, oid, watch_lock, watch_ctx, watch_handle,
@@ -26,7 +26,7 @@ public:
   }
 
   RewatchRequest(librados::IoCtx& ioctx, const std::string& oid,
-                 RWLock &watch_lock, librados::WatchCtx2 *watch_ctx,
+                 ceph::shared_mutex &watch_lock, librados::WatchCtx2 *watch_ctx,
                  uint64_t *watch_handle, Context *on_finish);
 
   void send();
@@ -53,7 +53,7 @@ private:
 
   librados::IoCtx& m_ioctx;
   std::string m_oid;
-  RWLock &m_watch_lock;
+  ceph::shared_mutex &m_watch_lock;
   librados::WatchCtx2 *m_watch_ctx;
   uint64_t *m_watch_handle;
   Context *m_on_finish;