Signed-off-by: Sage Weil <sage@inktank.com>
uint64_t librados::RadosClient::get_instance_id()
{
- lock.Lock();
- if (state == DISCONNECTED) {
- lock.Unlock();
+ Mutex::Locker l(lock);
+ if (state == DISCONNECTED)
return 0;
- }
uint64_t id = monclient.get_global_id();
- lock.Unlock();
return id;
}
bool librados::RadosClient::ms_dispatch(Message *m)
{
+ Mutex::Locker l(lock);
bool ret;
- lock.Lock();
if (state == DISCONNECTED) {
ldout(cct, 10) << "disconnected, discarding " << *m << dendl;
m->put();
} else {
ret = _dispatch(m);
}
- lock.Unlock();
return ret;
}