diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-03 08:15:08 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-06 16:45:05 -0700 |
| commit | c73c64a0f722477a5b0db93da2e26e313a5f52ba (patch) | |
| tree | 3ffd1dd50f66dfb3916273b05f095edee9f7bd12 | |
| parent | 6646e891ff0bd31c935d1ce0870367b1e086ddfd (diff) | |
| download | ceph-c73c64a0f722477a5b0db93da2e26e313a5f52ba.tar.gz | |
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>
| -rw-r--r-- | src/common/config.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/config.cc b/src/common/config.cc index 0b53f3969ad..4dce990cdb9 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) { |