]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/config: fix the lock in ConfigProxy::diff() 23276/head
authorKefu Chai <kchai@redhat.com>
Fri, 27 Jul 2018 04:13:42 +0000 (12:13 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 27 Jul 2018 04:14:55 +0000 (12:14 +0800)
it's a regression introduced by e406d8eb9e1deb801ecb346169eaaf96adbb4b53

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/common/config_proxy.h

index 2bcc7a44e6c911ccc46c04e59edb7033ca8e99b5..d6f75b10b87f481bdf056291536f7e2199c9fa09 100644 (file)
@@ -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};