From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Jul 2012 15:15:08 +0000 (-0700)
Subject: config: fix recursive lock in parse_config_files()
X-Git-Tag: v0.49~39^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7009c32ee7d8d0f325071581cb2933a9453d4f20;p=ceph.git

config: fix recursive lock in parse_config_files()

The _impl() helper is only called from parse_config_files(); don't retake
the lock.

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

diff --git a/src/common/config.cc b/src/common/config.cc
index ff39059b0c0..8f22b57df7f 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -198,7 +198,8 @@ int md_config_t::parse_config_files(const char *conf_files,
 int md_config_t::parse_config_files_impl(const std::list<std::string> &conf_files,
 					 std::deque<std::string> *parse_errors)
 {
-  Mutex::Locker l(lock);
+  assert(lock.is_locked());
+
   // open new conf
   list<string>::const_iterator c;
   for (c = conf_files.begin(); c != conf_files.end(); ++c) {