From: Samuel Just <sam.just@inktank.com>
Date: Sat, 20 Jul 2013 00:34:53 +0000 (-0700)
Subject: Finisher: use complete() not finish() and delete
X-Git-Tag: v0.67-rc1~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f591a630da2f45929aa8c92c1f6504580d86580;p=ceph.git

Finisher: use complete() not finish() and delete

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/common/Finisher.cc b/src/common/Finisher.cc
index 72bfb6f9aa7c..a1462a184d90 100644
--- a/src/common/Finisher.cc
+++ b/src/common/Finisher.cc
@@ -53,13 +53,11 @@ void *Finisher::finisher_thread_entry()
 	   p != ls.end();
 	   ++p) {
 	if (*p) {
-	  (*p)->finish(0);
-	  delete *p;
+	  (*p)->complete(0);
 	} else {
 	  assert(!ls_rval.empty());
 	  Context *c = ls_rval.front().first;
-	  c->finish(ls_rval.front().second);
-	  delete c;
+	  c->complete(ls_rval.front().second);
 	  ls_rval.pop_front();
 	}
 	if (logger)