From: John Spray <john.spray@redhat.com>
Date: Sun, 5 Mar 2017 15:27:46 +0000 (-0500)
Subject: common/finisher: use distinct lock names
X-Git-Tag: v12.0.3~159^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=64e36c5f8082afbb98cbd911b8fb526ab6568b6b;p=ceph-ci.git

common/finisher: use distinct lock names

Two Finishers should not be considered equivalent
for lockdep purposes: for example in mgr we have
our in-mgr Finisher, and then any finishers that
might be in libraries called by modules.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/Finisher.h b/src/common/Finisher.h
index 5947fa77df1..045b8e47a5a 100644
--- a/src/common/Finisher.h
+++ b/src/common/Finisher.h
@@ -142,7 +142,7 @@ class Finisher {
 
   /// Construct a named Finisher that logs its queue length.
   Finisher(CephContext *cct_, string name, string tn) :
-    cct(cct_), finisher_lock("Finisher::finisher_lock"),
+    cct(cct_), finisher_lock("Finisher::" + name),
     finisher_stop(false), finisher_running(false),
     thread_name(tn), logger(0),
     finisher_thread(this) {