]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
FileStore: use complete() instead of finish() and delete
authorSamuel Just <sam.just@inktank.com>
Sat, 20 Jul 2013 00:35:22 +0000 (17:35 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 22 Jul 2013 17:31:19 +0000 (10:31 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/os/FileStore.cc

index 1363eff27d1f70633634a8b4a3771c0233b90bfe..10f2b1f2aad4507c6280537dab39f9663cdda386 100644 (file)
@@ -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);