From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Jul 2018 04:13:42 +0000 (+0800)
Subject: common/config: fix the lock in ConfigProxy::diff()
X-Git-Tag: v14.0.1~737^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40e76aa4f07432338a0c8efbb16a10c7cc763d12;p=ceph.git

common/config: fix the lock in ConfigProxy::diff()

it's a regression introduced by e406d8eb9e1deb801ecb346169eaaf96adbb4b53

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/common/config_proxy.h b/src/common/config_proxy.h
index 2bcc7a44e6c9..d6f75b10b87f 100644
--- a/src/common/config_proxy.h
+++ b/src/common/config_proxy.h
@@ -71,8 +71,8 @@ public:
     return config.find_option(name);
   }
   void diff(Formatter *f, const std::string& name=string{}) const {
-    return config.diff(values, f, name);
     Mutex::Locker l{lock};
+    return config.diff(values, f, name);
   }
   void get_my_sections(std::vector <std::string> &sections) const {
     Mutex::Locker l{lock};