From: shangdehao1 <dehao.shang@intel.com>
Date: Wed, 12 Jun 2019 22:04:30 +0000 (+0800)
Subject: librbd: refine hard code and remove dead code
X-Git-Tag: v15.1.0~2379^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad8f6477b2ff47b0647fa6a4c848449a2930a45a;p=ceph.git

librbd: refine hard code and remove dead code

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
---

diff --git a/src/librbd/cache/ParentCacheObjectDispatch.cc b/src/librbd/cache/ParentCacheObjectDispatch.cc
index 65e55927da20e..a6a00def13f68 100644
--- a/src/librbd/cache/ParentCacheObjectDispatch.cc
+++ b/src/librbd/cache/ParentCacheObjectDispatch.cc
@@ -168,14 +168,11 @@ int ParentCacheObjectDispatch<I>::create_cache_session(Context* on_finish, bool
   Context* register_ctx = new FunctionContext([this, cct, on_finish](int ret) {
     if (ret < 0) {
       lderr(cct) << "Parent cache fail to register client." << dendl;
-      handle_register_client(false);
-      on_finish->complete(-1);
-      return;
+    } else {
+      ceph_assert(m_cache_client->is_session_work());
     }
-    ceph_assert(m_cache_client->is_session_work());
-
-    handle_register_client(true);
-    on_finish->complete(0);
+    handle_register_client(ret < 0 ? false : true);
+    on_finish->complete(ret);
   });
 
   Context* connect_ctx = new FunctionContext(
diff --git a/src/test/immutable_object_cache/test_DomainSocket.cc b/src/test/immutable_object_cache/test_DomainSocket.cc
index d1a1aa2cf1b91..ad9e79a0bfa3d 100644
--- a/src/test/immutable_object_cache/test_DomainSocket.cc
+++ b/src/test/immutable_object_cache/test_DomainSocket.cc
@@ -130,8 +130,6 @@ public:
 
   bool startup_lookupobject_testing(std::string pool_nspace, std::string object_id) {
     bool hit;
-    //auto ctx = new LambdaGenContext<std::function<void(ObjectCacheRequest*)>,
-    //    ObjectCacheRequest*>([this, &hit](ObjectCacheRequest* ack){
     auto ctx = make_gen_lambda_context<ObjectCacheRequest*, std::function<void(ObjectCacheRequest*)>>
        ([this, &hit](ObjectCacheRequest* ack){
        hit = ack->type == RBDSC_READ_REPLY;