From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 6 Jun 2016 01:26:34 +0000 (+0800)
Subject: tools/cephfs: fix lock
X-Git-Tag: v11.0.0~255^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=330e1ca0e11e8dbb0357397dcc21567211898761;p=ceph.git

tools/cephfs: fix lock

We shall release lock on error exit.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc
index f1102f35a483..6fd51d8b2625 100644
--- a/src/tools/cephfs/Resetter.cc
+++ b/src/tools/cephfs/Resetter.cc
@@ -95,8 +95,8 @@ int Resetter::reset(mds_role_t role)
   while (!done)
     cond.Wait(mylock);
   mylock.Unlock();
-    
-  lock.Lock();
+
+  Mutex::Locker l(lock);
   if (r != 0) {
     return r;
   }
@@ -106,8 +106,6 @@ int Resetter::reset(mds_role_t role)
     return r;
   }
 
-  lock.Unlock();
-
   cout << "done" << std::endl;
 
   return 0;