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

FileStore: use complete() instead of finish() and delete

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

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 1363eff27d1f..10f2b1f2aad4 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2028,8 +2028,7 @@ void FileStore::_finish_op(OpSequencer *osr)
   logger->tinc(l_os_apply_lat, lat);
 
   if (o->onreadable_sync) {
-    o->onreadable_sync->finish(0);
-    delete o->onreadable_sync;
+    o->onreadable_sync->complete(0);
   }
   op_finisher.queue(o->onreadable);
   delete o;
@@ -2126,8 +2125,7 @@ int FileStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
   // start on_readable finisher after we queue journal item, as on_readable callback
   // is allowed to delete the Transaction
   if (onreadable_sync) {
-    onreadable_sync->finish(r);
-    delete onreadable_sync;
+    onreadable_sync->complete(r);
   }
   op_finisher.queue(onreadable, r);