From: Samuel Just <sjust@redhat.com>
Date: Mon, 16 Nov 2015 17:13:34 +0000 (-0800)
Subject: ReplicatedPG::RepGather: remove on_finish, no more users
X-Git-Tag: v10.1.0~277^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=612fd3341a5a606bdffb596c051765c2372d7cf4;p=ceph.git

ReplicatedPG::RepGather: remove on_finish, no more users

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c9a5ada99921..19056260e577 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -8455,7 +8455,6 @@ void ReplicatedPG::remove_repop(RepGather *repop)
   }
 
   release_op_ctx_locks(repop->ctx);
-  repop->ctx->finish(0);  // FIXME: return value here is sloppy
   repop->put();
 
   osd->logger->dec(l_osd_op_wip);
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index b131f66fbc55..9aa57dc4cb4f 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -624,8 +624,6 @@ public:
 
     enum { W_LOCK, R_LOCK, E_LOCK, NONE } lock_to_release;
 
-    Context *on_finish;
-
     OpContext(const OpContext& other);
     const OpContext& operator=(const OpContext& other);
 
@@ -652,7 +650,6 @@ public:
       async_read_result(0),
       inflightreads(0),
       lock_to_release(NONE),
-      on_finish(NULL),
       release_snapset_obc(false) {
       if (obc->ssc) {
 	new_snapset = obc->ssc->snapset;
@@ -674,7 +671,6 @@ public:
       async_read_result(0),
       inflightreads(0),
       lock_to_release(NONE),
-      on_finish(NULL),
       release_snapset_obc(false) { }
     void reset_obs(ObjectContextRef obc) {
       new_obs = ObjectState(obc->obs.oi, obc->obs.exists);
@@ -695,13 +691,6 @@ public:
 	   pending_async_reads.erase(i++)) {
 	delete i->second.second;
       }
-      assert(on_finish == NULL);
-    }
-    void finish(int r) {
-      if (on_finish) {
-	on_finish->complete(r);
-	on_finish = NULL;
-      }
     }
   };
   using OpContextUPtr = std::unique_ptr<OpContext>;
@@ -826,7 +815,6 @@ protected:
 	 ctx->on_finish.erase(p++)) {
       (*p)();
     }
-    ctx->finish(r);
     delete ctx;
   }