From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Dec 2015 18:00:22 +0000 (-0500)
Subject: os/bluestore/BlockDevice: fix FS leak
X-Git-Tag: v10.0.3~154^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acc8217aea152bedfcdb3ba651113d46c00a2a61;p=ceph.git

os/bluestore/BlockDevice: fix FS leak

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlockDevice.cc b/src/os/bluestore/BlockDevice.cc
index 3afc4d7c2224..b59757052bce 100644
--- a/src/os/bluestore/BlockDevice.cc
+++ b/src/os/bluestore/BlockDevice.cc
@@ -146,12 +146,19 @@ void BlockDevice::close()
 {
   dout(1) << __func__ << dendl;
   _aio_stop();
+
+  assert(fs);
+  delete fs;
+  fs = NULL;
+
   assert(fd_direct >= 0);
   VOID_TEMP_FAILURE_RETRY(::close(fd_direct));
   fd_direct = -1;
+
   assert(fd_buffered >= 0);
   VOID_TEMP_FAILURE_RETRY(::close(fd_buffered));
   fd_buffered = -1;
+
   path.clear();
 }