RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: fix recursive lock in parse_config_files()

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

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-07-03 08:15:08 -07:00
parent 6646e891ff
commit c73c64a0f7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/config.cc
View File

@ -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) {