]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: simlify BlueFS::_stop_alloc
authorIgor Fedotov <ifedotov@suse.com>
Fri, 11 Oct 2019 13:57:33 +0000 (16:57 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Fri, 31 Jul 2020 12:36:51 +0000 (15:36 +0300)
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
src/os/bluestore/BlueFS.cc

index 201e8c0115bc1ec6d366cfaa7cced4580d0a6676..4cd260b811973517d0330f0e6dd58909b7744530 100644 (file)
@@ -652,12 +652,12 @@ void BlueFS::_stop_alloc()
 
   for (auto p : alloc) {
     if (p != nullptr && p != shared_bdev_alloc) {
-      p->shutdown();
-      delete p;
     }
   }
   for (size_t i = 0; i < alloc.size(); ++i) {
-    if (alloc[i] != shared_bdev_alloc) {
+    if (alloc[i] && alloc[i] != shared_bdev_alloc) {
+      alloc[i]->shutdown();
+      delete alloc[i];
       alloc[i] = nullptr;
     }
   }