From: Mykola Golub <mgolub@mirantis.com>
Date: Thu, 6 Apr 2017 06:49:51 +0000 (+0200)
Subject: rbd-mirror: possible lockdep false positive
X-Git-Tag: v12.0.3~320^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9365ea07f6ce54afc92cc953463087770721331f;p=ceph-ci.git

rbd-mirror: possible lockdep false positive

(when InstanceWatcher::remove_instance is called)

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd_mirror/InstanceWatcher.cc b/src/tools/rbd_mirror/InstanceWatcher.cc
index 2fe6f83f412..b59936a2640 100644
--- a/src/tools/rbd_mirror/InstanceWatcher.cc
+++ b/src/tools/rbd_mirror/InstanceWatcher.cc
@@ -21,6 +21,7 @@ namespace mirror {
 using librbd::util::create_async_context_callback;
 using librbd::util::create_context_callback;
 using librbd::util::create_rados_callback;
+using librbd::util::unique_lock_name;
 
 namespace {
 
@@ -98,7 +99,7 @@ InstanceWatcher<I>::InstanceWatcher(librados::IoCtx &io_ctx,
   : Watcher(io_ctx, work_queue, RBD_MIRROR_INSTANCE_PREFIX +
             (id ? *id : stringify(io_ctx.get_instance_id()))),
     m_instance_id(id ? *id : stringify(io_ctx.get_instance_id())),
-    m_lock("rbd::mirror::InstanceWatcher " + io_ctx.get_pool_name()),
+    m_lock(unique_lock_name("rbd::mirror::InstanceWatcher::m_lock", this)),
     m_instance_lock(librbd::ManagedLock<I>::create(
       m_ioctx, m_work_queue, m_oid, this, librbd::managed_lock::EXCLUSIVE, true,
       m_cct->_conf->rbd_blacklist_expire_seconds)) {