From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Mar 2017 22:17:54 +0000 (-0500)
Subject: mgr/MgrClient: move lock init into .h
X-Git-Tag: v12.0.2~252^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc128e882a5b6b1ae1a5d5f46cdeee3f185410c3;p=ceph.git

mgr/MgrClient: move lock init into .h

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index 8079aa8012a3f..cb5a39ade64bd 100644
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -31,7 +31,6 @@
 
 MgrClient::MgrClient(CephContext *cct_, Messenger *msgr_)
     : Dispatcher(cct_), cct(cct_), msgr(msgr_),
-      lock("mgrc"),
       timer(cct_, lock)
 {
   assert(cct != nullptr);
diff --git a/src/mgr/MgrClient.h b/src/mgr/MgrClient.h
index fce73cb7e58b6..69f676a3ebab1 100644
--- a/src/mgr/MgrClient.h
+++ b/src/mgr/MgrClient.h
@@ -56,7 +56,7 @@ protected:
 
   unique_ptr<MgrSessionState> session;
 
-  Mutex lock;
+  Mutex lock = {"MgrClient::lock"};
 
   uint32_t stats_period;
   SafeTimer     timer;