From: Vicente Cheng <freeze.bilsted@gmail.com>
Date: Tue, 3 May 2016 10:28:31 +0000 (+0800)
Subject: client: correct the client_lock order when cleanup
X-Git-Tag: v11.0.0~373^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75e445bc70949f4a73f6b2e29c634c5b2b194761;p=ceph.git

client: correct the client_lock order when cleanup

    As 448bea4, we need to handle a dependency
    between client lock and admin socket lock.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 7fcd907bc689..1e79390964a6 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -490,9 +490,9 @@ int Client::init()
   int r = monclient->init();
   if (r < 0) {
     // need to do cleanup because we're in an intermediate init state
-    objecter->shutdown();
     timer.shutdown();
     client_lock.Unlock();
+    objecter->shutdown();
     objectcacher->stop();
     monclient->shutdown();
     return r;