From: Igor Fedotov <ifedotov@suse.com>
Date: Fri, 11 Oct 2019 13:57:33 +0000 (+0300)
Subject: os/bluestore: simlify BlueFS::_stop_alloc
X-Git-Tag: v16.1.0~1536^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bfe87b3bb3f292e4b694cb5b5b35b473ff304a7;p=ceph.git

os/bluestore: simlify BlueFS::_stop_alloc

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 201e8c0115bc..4cd260b81197 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -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;
     }
   }