diff options
author | Samuel Just <sam.just@inktank.com> | 2013-07-19 17:35:22 -0700 |
---|---|---|
committer | Samuel Just <sam.just@inktank.com> | 2013-07-22 10:31:19 -0700 |
commit | 6c4cd22e608efc593228c02529077667ec01ec16 (patch) | |
tree | b42e7180ad3b0cfd44a0192de783290521d9f737 | |
parent | 9f591a630da2f45929aa8c92c1f6504580d86580 (diff) | |
download | ceph-6c4cd22e608efc593228c02529077667ec01ec16.tar.gz |
FileStore: use complete() instead of finish() and delete
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | src/os/FileStore.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 1363eff27d1..10f2b1f2aad 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); |