update ceph source to reef 18.2.1

[ceph.git] / ceph / src / librbd / ImageWatcher.cc

diff --git a/ceph/src/librbd/ImageWatcher.cc b/ceph/src/librbd/ImageWatcher.cc
index 08159d27092de202cca214195ccd1e9ec7c02392..fbb4c8339944d2e6b9c319d6e004dbe4d3d1a375 100644 (file)
--- a/ceph/src/librbd/ImageWatcher.cc
+++ b/ceph/src/librbd/ImageWatcher.cc
@@ -578,8 +578,7 @@ void ImageWatcher<I>::schedule_request_lock(bool use_timer, int timer_delay) {
     return;
   }
 
-  std::shared_lock watch_locker{this->m_watch_lock};
-  if (this->is_registered(this->m_watch_lock)) {
+  if (is_registered()) {
     ldout(m_image_ctx.cct, 15) << this << " requesting exclusive lock" << dendl;
 
     auto ctx = new LambdaContext([this](int r) {