]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: clean up finishers properly 11192/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 22 Sep 2016 07:16:03 +0000 (15:16 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Thu, 22 Sep 2016 07:16:03 +0000 (15:16 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BlueStore.cc

index adc6e843d8cf11a9e1706c27ebaa1c96e082f897..61b85ab160f7a1d43ee9f8d4b93f91e54412e234 100644 (file)
@@ -2110,7 +2110,7 @@ BlueStore::OnodeRef BlueStore::Collection::get_onode(
     on = new Onode(&onode_map, this, oid, key);
   } else {
     // loaded
-    assert(r >=);
+    assert(r >= 0);
     on = new Onode(&onode_map, this, oid, key);
     on->exists = true;
     bufferlist::iterator p = v.begin();
@@ -2202,8 +2202,8 @@ BlueStore::~BlueStore()
 {
   for (auto f : finishers) {
     delete f;
-    f = NULL;
   }
+  finishers.clear();
 
   g_ceph_context->_conf->remove_observer(this);
   _shutdown_logger();