client: fix leak of client_lock when not initialized

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 9c1ee5011640b3b4a38514be84f8350494cb71fd..b5e44b8fae5c6686889bd94df3cd8369605db9ff 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1473,7 +1473,7 @@ void Client::handle_client_reply(MClientReply *reply)
 
 bool Client::ms_dispatch(Message *m)
 {
-  client_lock.Lock();
+  Mutex::Locker l(client_lock);
   if (!initialized) {
     ldout(cct, 10) << "inactive, discarding " << *m << dendl;
     m->put();
@@ -1538,8 +1538,6 @@ bool Client::ms_dispatch(Message *m)
     }
   }
 
-  client_lock.Unlock();
-
   return true;
 }