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 0b53f3969add2f27c0d8d077de2529fd5905b216..4dce990cdb930a20ae0919eed879315ac3fbe8f8 100644 (file)
--- 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) {